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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-05-31 14:03:42 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:33:42 +0200
commit	98fe473d4508c6154aad8382edecd81d3e6b9189 (patch)
tree	3df13b43388eb51683dabe878e5ad58dc3e2a1ee /basebmp/source/makefile.mk
parent	01ac1eafe10b855ac0fb0e911a4c69228541de44 (diff)
parent	97dd4d4920c168f369536cb92add83bc54f54c95 (diff)
parent	1ec95f6dc406b4d6f432a8491dbc3fd04c2de58a (diff)
parent	0770b2664645eca8a6669bb134ab9a59349ff0b6 (diff)
parent	a24ed4a9d146127a698669b23635ba565c0f2e2f (diff)
parent	d0520c036f295a90d1877e285998a02d514f856a (diff)
parent	68c7f8fae5659753748eead42d12ed64db84702e (diff)
parent	457dd1604b5ebb9b10d7f2814851633393891c18 (diff)
parent	53017497738e9edd88b480cfaf31a11d1701835d (diff)
parent	38c1d35d15a0adc980c2355ff97ce327645cd954 (diff)
parent	f8e7afbac976ca862a801b9648fd95b2107757b2 (diff)
parent	52367d797ab764e7f83e1e8e3e6da901469505cb (diff)
parent	8c29919ec8428c9cbb2a1c8a7dad4dfcd232af5c (diff)
parent	d21adcdca61a7c54b3bf1584d80746dc0d2d1fc0 (diff)
parent	a8a0a0c5913444123b060c64da0e2b9c6832264e (diff)
parent	32b0f0d10079682a69fbc3bb2d4db1ec43715a88 (diff)
parent	e3d773e8b7b3f0dec89c9c6e8b4a563a54b37818 (diff)
parent	5c92fa80fcce16bb9dd0da89f9f5eafed3cb97b5 (diff)
parent	3d8c426a8b699a1e5a63942adbcfcbffb9a84d46 (diff)

merged tag ooo/DEV300_m80ooo/DEV300_m80