Jan Holesovsky 89c4f8907f Merge commit 'ooo/DEV300_m101' into intm101 ... Conflicts: cppunit/ldflags.patch hyphen/hyphen-2.4.patch libegg/source/eggtrayicon.c libtextcat/makefile.mk		2011-03-09 09:55:09 +01:00
..
prj	CWS-TOOLING: integrate CWS tkr16	2009-02-11 14:19:26 +00:00
makefile.mk	Fix typo	2011-01-24 11:44:43 +02:00
openssl.patch	Fix OpenSSL build for x64 Windows	2011-01-24 01:20:05 +02:00
openssllnx.patch	sb126: #i110197# fixed merge conflict	2010-09-20 10:53:39 +02:00
opensslmacosx.patch	jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)	2010-06-07 13:32:25 +02:00
opensslmingw.patch	mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name	2011-01-06 21:56:21 +09:00
opensslsol.patch	jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)	2010-06-07 13:32:25 +02:00
version.mk	jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)	2010-06-07 13:32:25 +02:00