merged tag ooo/OOO330_m2 - libreoffice/core - main, development code repository

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-07-26 17:27:06 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:54:47 +0200
commit	ba20463d49c03a10d8c03ab25b49bd4b3d3a917c (patch)
tree	b1a7ec279c6d516a9d05ae3aaf58da4a8634b8a2 /sal/textenc/convertiso2022cn.h
parent	a4eb2ecf691ecad4b29bacdba4995c20bc541c75 (diff)
parent	4224a3396cefd371328e25631a130f44598ecd9b (diff)
parent	69b48fb7fa47b4fa60b7c21f610f4eeace90fb78 (diff)
parent	9fb75fb322f93b9c73da4d467c44b4f08a468853 (diff)
parent	b16e44f08c9819d398955b3699bd30e4a48ab30c (diff)
parent	d27511b6c5f29a516dedc5b2e870c9d8025b5c38 (diff)
parent	58f7363e0857802c43e0ed2a81adead1b2e4ddce (diff)
parent	3b904d9d5ea7e0679c900539bdc099ee6e6221c3 (diff)
parent	ed873a73fde10c2a9511388024bef97522517cf4 (diff)
parent	ef05272548413db0482faf229e6f2653985001c1 (diff)
parent	85a4e97dc97a88c59ab0cf8a4d89d9f9413adf9f (diff)
parent	b6026341460a4c4fb89e9bb83bff4b40ba22ec75 (diff)
parent	6e36c1deb6833f22065cbcaa3c3113f6ffa45396 (diff)
parent	06d8dc602fb3fa13f768044dc0b8058eb7b393c2 (diff)
parent	1df0fe034e945bd140768d563e69417e623f3230 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	5021698508beac3fcf1ce9c76f0e489cc2dfc1f1 (diff)
parent	d90f2e3df8cea0304aba58c60b2fc22a366f428b (diff)
parent	0453ab6dd45bbdad0f4e91b25dc2a51f7b05a60a (diff)

merged tag ooo/OOO330_m2ooo/OOO330_m2