Merge branch 'master' into add-common-linux-compile-file-extensions
More upstream merges
This commit is contained in:
commit
c8d99ff857
@ -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/
|
||||
|
@ -1,9 +1,8 @@
|
||||
*.pydevproject
|
||||
.metadata
|
||||
.gradle
|
||||
bin/**
|
||||
tmp/**
|
||||
tmp/**/*
|
||||
bin/
|
||||
tmp/
|
||||
*.tmp
|
||||
*.bak
|
||||
*.swp
|
||||
|
12
Global/Lazarus.gitignore
Normal file
12
Global/Lazarus.gitignore
Normal 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
|
@ -1,2 +1,5 @@
|
||||
target/
|
||||
*.releaseBackup
|
||||
pom.xml.tag
|
||||
pom.xml.releaseBackup
|
||||
pom.xml.next
|
||||
release.properties
|
||||
|
@ -10,5 +10,6 @@ lib-cov
|
||||
pids
|
||||
logs
|
||||
results
|
||||
build
|
||||
|
||||
node_modules
|
||||
|
@ -39,6 +39,9 @@ coverage.xml
|
||||
.project
|
||||
.pydevproject
|
||||
|
||||
# Rope
|
||||
.ropeproject
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
*.pot
|
||||
|
Loading…
Reference in New Issue
Block a user