diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:24 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:24 +0200 |
| commit | e0785dd388faf57cd20bf3bb13a28ffc410911ef (patch) | |
| tree | c833c1cc1e912f862d9555c6faa41e1ccc08be66 /python/makefile.mk | |
| parent | Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2) (diff) | |
| parent | masterfix DEV300: #i10000# fixed includes (diff) | |
| download | core-e0785dd388faf57cd20bf3bb13a28ffc410911ef.tar.gz core-e0785dd388faf57cd20bf3bb13a28ffc410911ef.zip | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
python/makefile.mk
zlib/makefile.mk
Diffstat (limited to 'python/makefile.mk')
| -rw-r--r-- | python/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index eb72a267ca88..fb729bda8db5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,9 @@ PATCH_FILES=\ Python-parallel-make.patch \ Python-ssl.patch \ Python-aix.patch \ - Python-2.6.1-urllib.patch + Python-2.6.1-urllib.patch \ + Python-2.6.1-sysbase.patch \ + Python-2.6.1-nohardlink.patch CONFIGURE_DIR= |