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

diff options

author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2010-07-02 12:02:21 +0100
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:53:47 +0200
commit	e0c3b2e27dca05f94af02ab4dd5b46df23a1c968 (patch)
tree	dacd1cb8528a539ee455e068e1ab6c2125bcbd9b /agg/inc/agg_span_image_resample_gray.h
parent	ebd3d3ab2210f6f20da76cd8ce6ce43129843e50 (diff)
parent	3a982f421cb5faa584cd1ad5af7e034d3d46f782 (diff)
parent	6c16430117277b381160ba4de249a71f49a9ed07 (diff)
parent	09834f7dbd7086e6bf1c360c443fe5cf12c55b53 (diff)
parent	686b7955271806e65222a3a4bfe97365cab33a06 (diff)
parent	273fa6a6aa0d56660807ab29892f0618cfbb2e63 (diff)
parent	9a1826777ad9e79663a5e942f3bee1d85619b79e (diff)
parent	3b904d9d5ea7e0679c900539bdc099ee6e6221c3 (diff)
parent	fea4f71bcd4727fe0b445990d062fa4bc12dc18d (diff)
parent	4adb61dc6bb380ff31e145e6a77c92c0b26b42bd (diff)
parent	444742b5201b4036245348f6232a677038b6f057 (diff)
parent	d66343ab594fac375f4e3fc939594e9ebe5d4963 (diff)
parent	0e6d1583bc50cf27956f091ae8289ee164aefa1b (diff)
parent	be588658ea127a6a05390435126f1d739a477b58 (diff)
parent	1df0fe034e945bd140768d563e69417e623f3230 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)
parent	d57ac99460bae6dd3b85e803367fa82073819770 (diff)
parent	e92af537345358c7df58f89cf9da497277555592 (diff)
parent	5c62576e5d8af7379a57b45392d3c51c0bcd0fcc (diff)

merged tag ooo/OOO330_m0ooo/OOO330_m0