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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-03-08 16:36:32 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:31:22 +0200
commit	3c8deba5ea73149976fbf98b85bc08b5a8c62f4f (patch)
tree	4f6099b46eff6beeb534c1f8110a089ce48ec339 /canvas/source/java/TextLayout.java
parent	280d90e71523074fe803783c58a3f9f6418194e7 (diff)
parent	d1ea9488eb6abd66021a18d5daaa73f12c8f562e (diff)
parent	f512282ff2fd3e55cb88dc5c94d2db91d91bd3f5 (diff)
parent	34dfbf55a3363739f588aae68229cbead0c38d93 (diff)
parent	bd26f484336d86a10dcac5fc0fdbb3d35cb77f06 (diff)
parent	60c0e59fd450e39902d85918d2243fb83c02a21d (diff)
parent	cd8457ee4ff0ddf490539b8d620c38638ee08ae2 (diff)
parent	648aa89d8df7c1153d5f69cd53de1870ba6db1d1 (diff)
parent	47d83021c1fb1fb51cb268f7549d9d0f92531e66 (diff)
parent	2b800723513199616bb04c6bb377b685c4bde218 (diff)
parent	8d8c715352d37c28e0e4987a29dbdb3e3db50ac8 (diff)
parent	1a7789b3a5dcab90b2746d699c224d34293a098f (diff)
parent	697dd812b2c17fc2f5c2737e981854dedc41c26d (diff)
parent	f696d8ce6bbcc8cded7b075049a8c163c20c3782 (diff)
parent	bccbeb8b5bbd89a0d6957da2e35686a07fc2b161 (diff)
parent	2245eadb5d23c2df70aeccef8b00121afed80a0a (diff)
parent	4de2643ea718f0c246a87667036dbadacdbc708d (diff)
parent	9a832a9bdbda66a0c3bfec2ce3eb7ba5bcc2eb44 (diff)
parent	7fa96e56c6fe20ea496be40338124ba35aae9d84 (diff)

merged tag ooo/DEV300_m74ooo/DEV300_m74