[Libreoffice-commits] .: Branch 'feature/submodules' - 2 commits - binfilter dictionaries .gitignore .gitmodules helpcontent2

[Norbert Thiebaud]

 .gitignore   |   14 +-------------
 .gitmodules  |    3 ---
 binfilter    |    2 +-
 dictionaries |    2 +-
 helpcontent2 |    2 +-
 5 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 7e49b6d37476f33803df1d12da90b3cb47b12810
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Mar 9 13:05:51 2012 -0600

    adjust .gitignore
    
    If you want to hide your mess instead of cleaning-up your tree
    please do that in your .git/info/exclude or similar
    local places, and not in the shared/delivered settings

diff --git a/.gitignore b/.gitignore
index 65b2631..0b8463b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,10 @@
 \#*
 .DS_Store
 
-# StGit
-.stgit-edit.txt
-
 # python generated file
 *.pyc
 
 # where the 'subrepos' and downloads are located
-/clone
 /src
 
 # the build directories
@@ -102,6 +98,7 @@ TAGS
 
 # other repositories
 /translations
+/clone
 
 # compiled python objects for gdb pretty printers
 /solenv/gdb/libreoffice/*.py[co]
@@ -111,18 +108,9 @@ TAGS
 /solenv/bin/concat-deps
 /solenv/bin/concat-deps.exe
 
-# test output files
-test/user-template/user/psprint/pspfontcache
-
 # MSVC debug information
 /*/vc90.pdb
 
-# libxslt debug memdump
-.memdump
-
 # LibreOffice lock files
 .~lock.*#
 
-# Somepeople love debugging
-gdbtrace.log
-valgrind.log
diff --git a/binfilter b/binfilter
index 08ef890..22d181f 160000
--- a/binfilter
+++ b/binfilter
@@ -1 +1 @@
-Subproject commit 08ef890439805f5fdf21b05d60e6a28f63cb9eb3
+Subproject commit 22d181f13854ea5fbb5eb685e50848a9edefdac1
diff --git a/dictionaries b/dictionaries
index 2a71819..d5c8bc9 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2a71819109ce2947340241d67ab0c248a746a6a5
+Subproject commit d5c8bc9c9bb578fdc2abc0888b611ff9ec80e36b
diff --git a/helpcontent2 b/helpcontent2
index d35c02f..3dedc91 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d35c02fb9d6a031c6374ed00f34f20f91ff921a7
+Subproject commit 3dedc91ca1f0bea001daac761265e9a1170079e4
commit e6eef06172e7d69bf3651b289ebd479974b80395
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Mar 9 12:51:13 2012 -0600

    clean-up .gitmodule. remove erroneous entry

diff --git a/.gitmodules b/.gitmodules
index 4696d63..8cdf2d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "dictionaries"]
 	path = dictionaries
 	url = git://anongit.freedesktop.org/libreoffice/dictionaries
-[submodule "helcontent2"]
-	path = helcontent2
-	url = git://anongit.freedesktop.org/libreoffice/help
 [submodule "helpcontent2"]
 	path = helpcontent2
 	url = git://anongit.freedesktop.org/libreoffice/help