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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-12-21 17:37:00 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:39:53 +0200
commit	6bcec37dcb485bdf2b59a32f3e8b0ecb6a373e34 (patch)
tree	2b045ea683094e07beed535e6d656519734dc12c /solenv/doc/gbuild/solenv/gbuild/static_library.mk
parent	1990122456c6315b29932cb4b931fff926cefd84 (diff)
parent	dfcdf3dc703a95a373da52f9ee6c502ec393569d (diff)
parent	fb24a6ee5a649ec88c1aad805338eefc14f87f14 (diff)
parent	076fe89aaa7c1791b43856f30ac01430acb86936 (diff)
parent	e0cef95bab1bd41fce1f08be9d6a2fed71f16944 (diff)
parent	fcb659ae5ba83fe354842cf7bdefbdfb95894872 (diff)
parent	a23aac32c22c6106b72dcc2f621be535314cbc6e (diff)
parent	14a5ffc313f0bfdcdc75149db203ddca1d157a7b (diff)
parent	220821e1f4c3cb86a891e5864b665cadcfaed0c6 (diff)
parent	0bafb5a5e88a430440cb7a3ea42d787c6d1dcd79 (diff)
parent	794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff)
parent	99bb18c42fdc267a39c26a6e1bca6c1cae3d5d10 (diff)
parent	0d958c489c388268811cde22eb67043b2317ff14 (diff)
parent	7997ab5bac6fbdfe3b3427c322507a993d33acbc (diff)
parent	ed629cd4a908471bde99ca2039da18f6363923c0 (diff)
parent	cd4102b0e7d51f061a341a3b48556cbd057a4cfe (diff)
parent	0aea5f8fa50336696d98adfe70a0b3f06ffab90a (diff)
parent	77ffc6a41ba05725442df132131597fca78a84ea (diff)
parent	42c3881914531e6d81d6fb05bdc7b308db98146c (diff)

merged tag ooo/DEV300_m96ooo/DEV300_m96