Jan Holesovsky 5f7158e265 Merge commit 'ooo/DEV300_m101' into intm101 ...

Conflicts:
	boost/aliasing.patch
	boost/makefile.mk
	cairo/cairo/makefile.mk
	cairo/pixman/makefile.mk
	dictionaries/da_DK/README_th_da_DK.txt
	dictionaries/da_DK/description.xml
	dictionaries/da_DK/dictionaries.xcu
	dictionaries/da_DK/makefile.mk
	dictionaries/da_DK/th_da_DK.dat
	dictionaries/de_AT/th_de_AT_v2.idx
	dictionaries/de_CH/th_de_CH_v2.idx
	dictionaries/de_DE/COPYING
	dictionaries/de_DE/COPYING_GPLv2
	dictionaries/de_DE/COPYING_GPLv2.txt
	dictionaries/de_DE/README_extension_owner.txt
	dictionaries/de_DE/README_th_de_DE_v2.txt
	dictionaries/de_DE/makefile.mk
	dictionaries/de_DE/th_de_DE_v2.idx
	icu/makefile.mk
	moz/makefile.mk
	python/makefile.mk

2011-03-09 10:38:32 +01:00

..

prj

Elide all "SO:" and "OOo:" build.lst prefixes

2010-11-04 23:37:59 +01:00

makefile.mk

Merge commit 'ooo/DEV300_m101' into intm101

2011-03-09 10:38:32 +01:00

Python-2.6.1-mingw.patch

CWS-TOOLING: integrate CWS mingwport22

2009-08-26 06:36:38 +00:00

Python-2.6.1-urllib.patch

fixed urllib.urlopen in the internal python (fdo#31466)

2010-11-23 18:38:31 +01:00

Python-2.6.1-vc10.patch

Visual Studio 2010 project files for Python

2010-10-29 01:14:45 +02:00

Python-2.6.1.patch

Make debugging the Python interpreter simpler

2011-02-14 02:41:32 +02:00

Python-aix.patch

get this to build on AIX

2010-10-13 14:42:06 +01:00

Python-parallel-make.patch

ause126: #i114866# applied patch from issue: fix parallel build issue

2010-10-08 16:12:40 +02:00

Python-ssl.patch

Clean up Python patches a bit

2011-02-14 02:41:30 +02:00

pyversion.mk

CWS-TOOLING: integrate CWS python26

2009-04-22 14:05:37 +00:00