diff options
| author | Kristofer Rye <kristofer.rye@gmail.com> | 2013-11-26 22:55:19 -0500 |
|---|---|---|
| committer | Kristofer Rye <kristofer.rye@gmail.com> | 2013-11-26 22:55:19 -0500 |
| commit | c8d99ff857256d2de365bf62942338e7614379e2 (patch) | |
| tree | 31626ee6ff8d09b5926b0ede36e3fefd01c8f604 | |
| parent | 38488f24407e7c6e72c9d6cd7b360bef0776ff49 (diff) | |
| parent | 8e9563a7c928e8dcb5587c9e4ca818360e669a21 (diff) | |
| download | gitignore-c8d99ff857256d2de365bf62942338e7614379e2.tar.gz gitignore-c8d99ff857256d2de365bf62942338e7614379e2.zip | |
Merge branch 'master' into add-common-linux-compile-file-extensions
More upstream merges
| -rw-r--r-- | GWT.gitignore | 12 | ||||
| -rw-r--r-- | Global/Eclipse.gitignore | 5 | ||||
| -rw-r--r-- | Global/Lazarus.gitignore | 12 | ||||
| -rw-r--r-- | Maven.gitignore | 5 | ||||
| -rw-r--r-- | Node.gitignore | 1 | ||||
| -rw-r--r-- | Python.gitignore | 3 |
6 files changed, 34 insertions, 4 deletions
diff --git a/GWT.gitignore b/GWT.gitignore index c558713f..07704e54 100644 --- 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 index 73468714..72727761 100644 --- 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 new file mode 100644 index 00000000..e7149354 --- /dev/null +++ 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
\ No newline at end of file diff --git a/Maven.gitignore b/Maven.gitignore index 6ca4036f..94eab12d 100644 --- 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 index cfdef680..c84ba258 100644 --- 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 index 3d578453..50a87264 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -39,6 +39,9 @@ coverage.xml .project .pydevproject +# Rope +.ropeproject + # Django stuff: *.log *.pot |