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
commit c8d99ff857
6 changed files with 34 additions and 4 deletions

View File

@ -14,3 +14,15 @@ gwt-unitCache/
# more caches and things from deploy # # more caches and things from deploy #
war/WEB-INF/deploy/ war/WEB-INF/deploy/
war/WEB-INF/classes/ 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/

View File

@ -1,9 +1,8 @@
*.pydevproject *.pydevproject
.metadata .metadata
.gradle .gradle
bin/** bin/
tmp/** tmp/
tmp/**/*
*.tmp *.tmp
*.bak *.bak
*.swp *.swp

12
Global/Lazarus.gitignore Normal file
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

View File

@ -1,2 +1,5 @@
target/ target/
*.releaseBackup pom.xml.tag
pom.xml.releaseBackup
pom.xml.next
release.properties

View File

@ -10,5 +10,6 @@ lib-cov
pids pids
logs logs
results results
build
node_modules node_modules

View File

@ -39,6 +39,9 @@ coverage.xml
.project .project
.pydevproject .pydevproject
# Rope
.ropeproject
# Django stuff: # Django stuff:
*.log *.log
*.pot *.pot