diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
| commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
| tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /.gitignore | |
| parent | 817da75b0809642d68b3cab35a1a9348139e9321 (diff) | |
| parent | 35c884841001c6367d428db8e4407afc4d5077ca (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index bdc4858d0db7..d82ad755e3fa 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,6 @@ /bin/repo-list /src.downloaded /ooo.lst -/instsetoo_native/* # misc /set_soenv.last @@ -131,6 +130,9 @@ /formula /fpicker /framework +/gdk-pixbuf +/gettext +/glib /graphite /helpcontent2 /hsqldb @@ -154,7 +156,11 @@ /l10n /l10ntools /languagetool +/libcroco /libegg +/libgsf +/libpng +/librsvg /libtextcat /libvisio /libwpd @@ -191,6 +197,7 @@ /package /packimages /padmin +/pango /postprocess /psprint_config /python |