diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:13:58 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:13:58 +0100 |
| commit | 88d7b9b03fa77231a139d8cf183ffaae16666eee (patch) | |
| tree | 00ae843905f2edff5712eefcb69170b0c68fae09 /sal/prj | |
| parent | a3a19632f413a6fe8dee97f02d637e7197869b50 (diff) | |
| parent | a4632bb6a212a67d0e1e0b1c887ec1cbe30c1cf8 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure
Conflicts:
sal/qa/rtl/math/rtl_math.cxx
sal/qa/rtl/math/test_rtl_math.cxx
Diffstat (limited to 'sal/prj')
| -rw-r--r-- | sal/prj/build.lst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sal/prj/build.lst b/sal/prj/build.lst index 80b70250f641..1813ffe91ab6 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -29,4 +29,8 @@ sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util NULL sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util NULL sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util NULL +sa sal\qa\rtl\crc32 nmake - all sa_qa_rtl_crc32 sa_cppunittester sa_util NULL +sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util NULL +sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util NULL +sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util NULL sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL |