diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 21:12:53 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 21:12:53 +0200 |
commit | 66bf06edd047c8c1ce5df3bd49a40e31d1db5b8a (patch) | |
tree | 19d6b6590fb3120b799a87399255856cd1885229 /sax/source | |
parent | Merge remote-tracking branch 'origin/integration/dev300_m106' (diff) | |
parent | Remove last trace of SvXub_StrLensSort. LGPLv3+/MPL. (diff) | |
download | core-66bf06edd047c8c1ce5df3bd49a40e31d1db5b8a.tar.gz core-66bf06edd047c8c1ce5df3bd49a40e31d1db5b8a.zip |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-gui
Conflicts:
vcl/source/control/makefile.mk
vcl/unx/generic/printer/ppdparser.cxx
Diffstat (limited to 'sax/source')
0 files changed, 0 insertions, 0 deletions