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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-11-03 12:53:27 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:38:22 +0200
commit	b39c43856328487729e7c2dad546676705724323 (patch)
tree	1dca36808500d96dddc53cfb44881eff55b7b4db /basic/source/comp/makefile.mk
parent	e3b20eddac9e2a84e9dcb88c97d9a70492ea6ecb (diff)
parent	dfcdf3dc703a95a373da52f9ee6c502ec393569d (diff)
parent	d99b499c29cf9103f30fc639374c062b43b59d36 (diff)
parent	abeb5c3df14e3c0054d59904ae172c08e00294ef (diff)
parent	8f45f8b701ad4e5d93c57ddd5669ae1befad6133 (diff)
parent	8373a5b7946d6731609f989f1aa4a762ed70854a (diff)
parent	364f4060802a3553e499d80197065e9c7f32ee5b (diff)
parent	dc299baa3ec0e0eb2ae50089c5570aea27e4d322 (diff)
parent	5b87db5f3e00ea6e04af2b514f5f869cea59af09 (diff)
parent	0c8fbf75eead7b6b29e62831722c4e9d8b1950c5 (diff)
parent	3c21373571fd0cf89391502aa132c5f420cd75c6 (diff)
parent	7193ff6602780443d0c0b6ec8dac057db6983e4d (diff)
parent	463299a59507a83ec07e17d547e76cfea19c673c (diff)
parent	95f71183414a50d12cd4bbacf47d711672e63268 (diff)
parent	e231900902cf5d460ad5ee6cbe447133594b11e7 (diff)
parent	11cbcded85208d00cca8fc1b3d220b9154e268fc (diff)
parent	af2a356a99ba10b0d48fc70d7f12921eb50111ba (diff)
parent	811f65527244763aeac1f53625392121c7e7bbd5 (diff)
parent	ca2e5d3b551e1b7bcc0b4f0c37b431927f6cbbff (diff)

merged tag ooo/DEV300_m92ooo/DEV300_m92