Merge remote-tracking branch 'remotes/upstream/master'

9dd829c4 · Michael Bemmerl · e6117c95 · 88320f20 · 9dd829c4 · 9dd829c4
Commit 9dd829c4 authored Jun 05, 2011 by Michael Bemmerl
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

NetBeans.gitignore Global/NetBeans.gitignore +1 -0

PlayFramework.gitignore PlayFramework.gitignore +1 -0

Ruby.gitignore Ruby.gitignore +8 -9

No files found.
--- a/Global/NetBeans.gitignore
+++ b/Global/NetBeans.gitignore
 nbproject/
+nbactions.xml
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -9,6 +9,7 @@ db
 eclipse
 log
 logs
+precompiled
 tmp
 test-result
 eclipse

--- a/Ruby.gitignore
+++ b/Ruby.gitignore
+*.gem
+*.rbc
+.bundle
+.config
 coverage
-rdoc
+InstalledFiles
+lib/bundler/man
 pkg
+rdoc
+spec/reports
 test/tmp
 test/version_tmp
 tmp
-pkg
-*.gem
-*.rbc
-lib/bundler/man
-spec/reports
-.config
-InstalledFiles
-.bundle
 # YARD artifacts
 .yardoc