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

This commit is contained in:
Michael Bemmerl 2011-06-05 23:48:03 +02:00
commit 9dd829c486
3 changed files with 10 additions and 9 deletions

View File

@ -1 +1,2 @@
nbproject/ nbproject/
nbactions.xml

View File

@ -9,6 +9,7 @@ db
eclipse eclipse
log log
logs logs
precompiled
tmp tmp
test-result test-result
eclipse eclipse

View File

@ -1,17 +1,16 @@
*.gem
*.rbc
.bundle
.config
coverage coverage
rdoc InstalledFiles
lib/bundler/man
pkg pkg
rdoc
spec/reports
test/tmp test/tmp
test/version_tmp test/version_tmp
tmp tmp
pkg
*.gem
*.rbc
lib/bundler/man
spec/reports
.config
InstalledFiles
.bundle
# YARD artifacts # YARD artifacts
.yardoc .yardoc