Merge remote branch 'origin/master'

Attempt to fix conflicts between pablotdl and davidkarlsen's Conflicts: .gitignore pom.xml projects/pom.xml projects/spring-modules-cache/pom.xml
astubbs · Jan 28, 2010 · d9e8e0b · d9e8e0b
2 parents b87654c + 2fa3344
commit d9e8e0b
Show file tree

Hide file tree

Showing 150 changed files with 868 additions and 8,698 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@ target
 .settings
 .classpath
 .project
-
-
+/projects/spring-modules-cache/logs/gigaspaces0_0.log
+bin
diff --git a/.project b/.project
diff --git a/build/.cvsignore b/build/.cvsignore
diff --git a/build/build-continuous.xml b/build/build-continuous.xml
diff --git a/build/build.properties b/build/build.properties