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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-02-02 11:27:57 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:41:18 +0200
commit	ddb42e27cee05e7d5f9dbf2d7f973ac488bbcd39 (patch)
tree	09958e1d366afa56e644b2b2db6acf637a926c8a /instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico
parent	01657ddc917056429d70a992af89cdd5b2b6588c (diff)
parent	81aa6703bd21dcde2ee7c679c30a45a41ec2715d (diff)
parent	b98b964dc2735ca4c42a3905ef5eddcddba411c1 (diff)
parent	5410e4b4c6d5547a3f131f5c9e52966b6e0f549b (diff)
parent	0ceb085ea2b49234664765161095f2e5911e2b3b (diff)
parent	c395e5608ce118f4296083632d6662f278f0b8fc (diff)
parent	930d21a24b06926d8c9c10109e9b3bec56a4fe5e (diff)
parent	380bc7149ae9fa0f971eb40249ad60acb3c15cf4 (diff)
parent	df8eb7fcb2b895e43f5c08174699011453aea336 (diff)
parent	1a0a7970636e093d015267b828ecd8d5c2543541 (diff)
parent	a1a2a5a68046e75aba3dfd6ba06083a314f12182 (diff)
parent	26e045d0c4c6647a5752d9d108860aeb9106b249 (diff)
parent	e313c2ff7cf92c6168a4a5649e5f4bbed96a37b5 (diff)
parent	99ff7a9fb521895d6ba18ca4ca92d7eb0c3524fd (diff)
parent	4f4f66dc0cd0ec329c9077c84bba9736d67b30d3 (diff)
parent	e10427dc4b92543f7e304b6b23b1b0ea5006fdcf (diff)
parent	06601d33f1b67b228b4dc3945ce0a52191effbbe (diff)
parent	aa2fc0e7863f1acd4712f59a10257ecdddc885f8 (diff)
parent	5b7dc4c9b5c1190edce19e568676270f315c31e6 (diff)

merged tag ooo/DEV300_m99ooo/DEV300_m99