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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-03-09 16:11:38 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:42:32 +0200
commit	169df71f3ca40692007659bc4cffa45eab5e442d (patch)
tree	9e1fa490bf605644198fd50b46182540ba674512 /setup_native/scripts/source/getuid.c
parent	9aa7e22f17a3b3f45f9e6d0f131036559307be4e (diff)
parent	43fc6767f0779bdfa9c2a75f9c38387b7874bae2 (diff)
parent	dee1ea70160df84946cf9040281de42945faf65a (diff)
parent	ab76fab508323772bc2a66292637018183093682 (diff)
parent	61b8bd9f42f48609a14cab31f58d5122285e67f6 (diff)
parent	e8a6c5a27713a2bbc378ca999beb272e7cdd63ef (diff)
parent	39250f089adfce87856a0a7a250511decd7418e2 (diff)
parent	1bbffcffe00fee97db8e40e07da74039fd02ccb4 (diff)
parent	82c070266d0440348c61c710e0caa89ae1e74b1b (diff)
parent	852a59c2ec6d967d601ae00eac41893820e4b1c1 (diff)
parent	d07e4ca3fedf2c59bc4867ed4dd931dd35149cbb (diff)
parent	1e94a4e6c2591d3ad9101e5b524294a5986c0949 (diff)
parent	ae08e3638399fce427ad5fbcdead566d8800f5ba (diff)
parent	f59ba28bac7a38bb86e10779ca38276259dc79e7 (diff)
parent	981e76f631cc591e356c0242943f114804f907db (diff)
parent	33e2b11638c87ffed5d91405ba76cb00cd91e1be (diff)
parent	fa8f20aa6d3704e795b3ac6854d22ef1cd7438e9 (diff)
parent	5d493f49ae63249f4781a9e7228dda55fb0fff13 (diff)
parent	b381f759166cc326f413ae6af0a8e5351d895198 (diff)

merged tag ooo/DEV300_m102ooo/DEV300_m102