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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2009-12-17 17:08:37 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:29:01 +0200
commit	bc31b087dbd6168b7b037ca59192c6d50f330d09 (patch)
tree	74802dff9696d0b06597b0ee7d06ce626e180462 /agg/inc/agg_pixfmt_amask_adaptor.h
parent	f433dba78fd5c4650d7765e82bf7377e905ed7b0 (diff)
parent	480616656e0daf1e33feb00cb2a3d001ea65f202 (diff)
parent	9b251503202b1197a16f6f66adf262e68427c3f5 (diff)
parent	2be04fff7b9d51a3f1cf61ddb9cd76286b48b375 (diff)
parent	50e1b982ff532184892b63dd2634571b2ef6ce8e (diff)
parent	b87a09786de6f985602ef29f275f44a9944992ce (diff)
parent	725b64a71e15f2f419be0fb12700bf9be70625a4 (diff)
parent	a87218a52bf48e518b8365162983855bfbe924f8 (diff)
parent	7fef57f108fe4f219773d5511040bd166ee0a01c (diff)
parent	eb86211c1db0bb492669e7ac8302b89254ed4793 (diff)
parent	0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff)
parent	06b1cfd68a0891c5652e7c78498e4b40afd902b2 (diff)
parent	da42440ee30c2a15803fe159855f64dec97ad45a (diff)
parent	0c5348ff2c5cede4607555fdab45642db10b07ba (diff)
parent	705bec7bdf138a6f7d1c43aba6ceebe98f4b236e (diff)
parent	93734378238f111aa55ad985ddd933684ee71010 (diff)
parent	c6639a96183e87dded81016410c85bd0e3a86fbf (diff)
parent	fed92864b28a32bee9d7cd8bfffd5a4b523e18d4 (diff)
parent	3439c301e10bf14bdc7d1494ea0a4b5f170627bb (diff)

merged tag ooo/DEV300_m68ooo/DEV300_m68