summaryrefslogtreecommitdiffstats
path: root/sax/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-05-27 21:12:53 +0200
committerJan Holesovsky <kendy@suse.cz>2011-05-27 21:12:53 +0200
commit66bf06edd047c8c1ce5df3bd49a40e31d1db5b8a (patch)
tree19d6b6590fb3120b799a87399255856cd1885229 /sax/source
parentMerge remote-tracking branch 'origin/integration/dev300_m106' (diff)
parentRemove last trace of SvXub_StrLensSort. LGPLv3+/MPL. (diff)
downloadcore-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