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/d.lst | |
| 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/d.lst')
0 files changed, 0 insertions, 0 deletions