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

mibe · mibe · commit 9dd829c4861e · 2011-06-05T23:48:03.000+02:00
diff --git a/Global/NetBeans.gitignore b/Global/NetBeans.gitignore
@@ -1 +1,2 @@
 nbproject/
+nbactions.xml
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
@@ -9,6 +9,7 @@ db
 eclipse
 log
 logs
+precompiled
 tmp
 test-result
 eclipse
diff --git a/Ruby.gitignore b/Ruby.gitignore
@@ -1,17 +1,16 @@
+*.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
