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

More upstream merges
This commit is contained in:
Kristofer Rye
2013-11-26 22:55:19 -05:00
6 changed files with 34 additions and 4 deletions
+12
View File
@@ -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/
+2 -3
View File
@@ -1,9 +1,8 @@
*.pydevproject
.metadata
.gradle
bin/**
tmp/**
tmp/**/*
bin/
tmp/
*.tmp
*.bak
*.swp
+12
View File
@@ -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
+4 -1
View File
@@ -1,2 +1,5 @@
target/
*.releaseBackup
pom.xml.tag
pom.xml.releaseBackup
pom.xml.next
release.properties
+1
View File
@@ -10,5 +10,6 @@ lib-cov
pids
logs
results
build
node_modules
+3
View File
@@ -39,6 +39,9 @@ coverage.xml
.project
.pydevproject
# Rope
.ropeproject
# Django stuff:
*.log
*.pot