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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-09-06 13:50:48 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:56:53 +0200
commit	408fdfe217968e55f60fbd7cb4be910335f12d89 (patch)
tree	ca00da184de8c508f9398fde0db585aa06f5b4ce /agg/source/makefile.mk
parent	c52ff698d78a3bb9f74a32549ee54c59ac16a4d1 (diff)
parent	c46f11881347616ac54051167de75ed29d67784d (diff)
parent	a86eb1b0660a7a1198b36ff5eb6d641554b61e2d (diff)
parent	a6ac4de57318d096a800698120ce156d549d1adf (diff)
parent	8c8d2a8a8f0721ebf8767ab2f0a058730d16996f (diff)
parent	109c2197d582f84509e11290caf4ca73ab0da104 (diff)
parent	2c454f28690c46f014e25ae6cae3702109232de5 (diff)
parent	9b453b0a518a91fd1f18e5c81ac0767251875a2d (diff)
parent	fd12d39009d99e595956de0f018da2d775252c75 (diff)
parent	335c73b09da27c71781b546706fe92e9f4aedc2e (diff)
parent	f39adb3c348cbbd8dece7f60f88a2f7abeb94fa8 (diff)
parent	49f8905e0e115ddc2179580564f139667796a620 (diff)
parent	6e36c1deb6833f22065cbcaa3c3113f6ffa45396 (diff)
parent	fb46f7604731b35033691987ef4936a5248c9b88 (diff)
parent	1834c5739669225fd9b5fd77d892207d636762b5 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	56d8aea4a2e85ddc8d4aa0e3ee63a01af364acca (diff)
parent	8c29f37b193ac59d62879b0303a997f09613e1db (diff)
parent	dcb91410f82e4797af2c76c023e2c69cdcb77912 (diff)

merged tag ooo/OOO330_m7ooo/OOO330_m7