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

2011-06-05 23:48:03 +02:00 · 2011-06-05 23:48:03 +02:00 · 9dd829c486
commit 9dd829c486
parent e6117c95dc 88320f20dc
3 changed files with 10 additions and 9 deletions
--- a/Global/NetBeans.gitignore
+++ b/Global/NetBeans.gitignore
@ -1 +1,2 @@
 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
@ -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