Merge branch 'master' into add-common-linux-compile-file-extensions

rye · rye · commit c8d99ff85725 · 2013-11-26T22:55:19.000-05:00
More upstream merges
diff --git a/GWT.gitignore b/GWT.gitignore
@@ -14,3 +14,15 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
+
+#compilation logs
+.gwt/
+
+#caching for already compiled files
+gwt-unitCache/
+
+#gwt junit compilation files
+www-test/
+
+#old GWT (1.5) created this dir
+.gwt-tmp/
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
@@ -1,9 +1,8 @@
 *.pydevproject
 .metadata
 .gradle
-bin/**
-tmp/**
-tmp/**/*
+bin/
+tmp/
 *.tmp
 *.bak
 *.swp
diff --git a/Global/Lazarus.gitignore b/Global/Lazarus.gitignore
@@ -0,0 +1,12 @@
+#ignore backup files
+backup/
+
+#ignore files generated by the compiler
+lib/
+*.compiled
+*.o
+*.or
+*.ppu
+
+#exclude executable output in windows
+*.exe
diff --git a/Maven.gitignore b/Maven.gitignore
@@ -1,2 +1,5 @@
 target/
- *.releaseBackup
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.next
+release.properties
diff --git a/Node.gitignore b/Node.gitignore
@@ -10,5 +10,6 @@ lib-cov
 pids
 logs
 results
+build
 
 node_modules
diff --git a/Python.gitignore b/Python.gitignore
@@ -39,6 +39,9 @@ coverage.xml
 .project
 .pydevproject
 
+# Rope
+.ropeproject
+
 # Django stuff:
 *.log
 *.pot

-Original file line number
+Diff line change
 pids
 logs
 results
 +build
 node_modules