diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
| commit | bcb1ceafcc18aaa8199b21478dde39bdb9ae83dd (patch) | |
| tree | 619295a796fca507fa238235093b2c35323ffe84 /oox | |
| parent | 102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c (diff) | |
| parent | 348f3a8b166c7c937766a25ec43eb9c0ecb38200 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
filter/source/graphicfilter/eps/eps.cxx
oox/source/export/shapes.cxx
oox/source/xls/workbookhelper.cxx
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/prj/build.lst b/oox/prj/build.lst index a337de62f30f..1724e8e2248a 100644 --- a/oox/prj/build.lst +++ b/oox/prj/build.lst @@ -1,3 +1,3 @@ -oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL +oox oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL oox oox usr1 - all oox_mkout NULL oox oox\prj nmake - all oox_prj NULL |