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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-04-08 16:11:45 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:32:09 +0200
commit	3f78931399b5340f928a4c91ff40df13d74bdcbb (patch)
tree	196e237b4c0391559f694e4ba448a66e741d42c7 /framework/util/makefile.mk
parent	545c98e36d295b2832011066d625ec62a59bcb02 (diff)
parent	7e0aaf7b31fe481bb148f310cedf5cc0a2029084 (diff)
parent	52cc8fded55d1761c6913a3704a03a7c137a7f3d (diff)
parent	9c17c7ed4f09499be3f6bfcbf2f5aa246d998634 (diff)
parent	6a30f2a3025a9db27d1230d9498570964cd74e3f (diff)
parent	1b192bd38a3695cc2965ece438d47d6f74958289 (diff)
parent	f12056dce676eee306d34d06fb4bbbc452d9216c (diff)
parent	b94cad41f35d3abcfb75b2b44980b6a72bb07238 (diff)
parent	b831dc7de1114c1568b6f14f89180fafc7cf11df (diff)
parent	e725e315399f527e63f919a9a6861066b1f41512 (diff)
parent	a001605a190749900d3e09aa864ce56925ff848e (diff)
parent	27a769544799e45c1d91911c961edc76c070e0f4 (diff)
parent	8d93a1debc450fcc799be37991ce3f5c5eeda018 (diff)
parent	0768a7d2726ce4f0772b52d95eeb23143336655c (diff)
parent	aa1ca8afea58bf52e6011ff7a1405c04dac0345e (diff)
parent	34713223a006e3c950aa9022f8746a0c7ee5f50e (diff)
parent	aaf6ec88433c13fcb0b76b48eb6f958183c4b574 (diff)
parent	9734c73c9a61fc5ef4e263617add17914a9b5f15 (diff)
parent	c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff)

merged tag ooo/DEV300_m76ooo/DEV300_m76