From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 12 Jan 2010 23:45:56 +0000 (-0700)
Subject: Merge branch 'horde-hatchery' into horde-git
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a8629432eb42a7f3cf9f010f5fba52a6583648bd;p=horde.git

Merge branch 'horde-hatchery' into horde-git

Conflicts:
	.gitignore
---

a8629432eb42a7f3cf9f010f5fba52a6583648bd
diff --cc .gitignore
index 68cd07784,714f32a00..19eb632ac
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,4 +1,5 @@@
- */config/*.php
  .DS_Store
- /lib/
++.buildpath
  .cache
  .project
  .settings
@@@ -9,9 -14,24 +8,40 @@@
  *.orig
  *.rej
  
- !horde/config/nls.php
- horde/config/registry.d/*.php
++# Ignore testing files
++run-tests.log
++framework/*/tests/*.diff
++framework/*/tests/*.exp
++framework/*/tests/*.log
++framework/*/tests/*.out
++framework/*/tests/*.php
++
++# Dynamically generated content that may live in the repo directories
++lib/
++libs/
 +horde/libs/
 +horde/static/*.*
 +
+ # Ignore locally defined config
+ */config/*.php
+ */config/*.txt
 +framework/bin/*.conf
++!horde/config/nls.php
++horde/config/registry.d/*.php
+ 
+ # Application specific excludes
+ ApertureToAnselExportPlugin/build/
+ ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.pbxuser
+ !ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/default.pbxuser
+ ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.perspectivev3
+ ApertureToAnselExportPlugin/*.pbxproject
+ ApertureToAnselExportPlugin/Installer/*.pkg
+ 
+ framework/Rdo/examples/Horde/Rdo/conf.php
+ 
+ iPhoto2Ansel/build/
+ iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.pbxuser
+ !iPhoto2Ansel/iPhoto2Ansel.xcodeproj/default.pbxuser
+ iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.perspectivev3
+ iPhoto2Ansel/*.pbxproject
+ iPhoto2Ansel/Installer/*.pkg
 -