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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-07-14 14:48:12 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:54:22 +0200
commit	a4eb2ecf691ecad4b29bacdba4995c20bc541c75 (patch)
tree	c170c286eb0e6c69ffe3ac0b4399c2ba131ad09c /libwpd
parent	e0c3b2e27dca05f94af02ab4dd5b46df23a1c968 (diff)
parent	4224a3396cefd371328e25631a130f44598ecd9b (diff)
parent	6c16430117277b381160ba4de249a71f49a9ed07 (diff)
parent	c8099f69bbbce2d15dde8a9077a975e72cc3c304 (diff)
parent	9720a92e9c862560bdeced5931550e6d0f60059c (diff)
parent	a34dc4114a103abe5de68ac573f4a830cbc35b77 (diff)
parent	9a1826777ad9e79663a5e942f3bee1d85619b79e (diff)
parent	3b904d9d5ea7e0679c900539bdc099ee6e6221c3 (diff)
parent	2a77fa44f3b2ccf8bf070e7d7350c801fa560d1d (diff)
parent	1d97771f1ea5dffc86a0fc5b1e1ec90a34553092 (diff)
parent	49b06312d167ec3c210062ef704f8403abadf058 (diff)
parent	8ae3b89540c0a5044126c59776642c898ce6ef50 (diff)
parent	7b43eb48bac2cfe6810fe6a784519cef5875c597 (diff)
parent	a1e6cecc361c2f6e26ee6738231184022f6b18dd (diff)
parent	1df0fe034e945bd140768d563e69417e623f3230 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	135c3397ff46737f0ef7a8f14f1050736e535347 (diff)
parent	5394e06d449e0c1326edd899553f9ab3d67b7078 (diff)
parent	b0289f45e20706eb2dd2394cc979f50bb98c6ac1 (diff)

merged tag ooo/OOO330_m1ooo/OOO330_m1