Merge RubyMotion into Ruby

diff --git a/Ruby.gitignore b/Ruby.gitignore
index 99e72c12b9e31e3962bd5261c743025d15aa26c6..f2c136079ca1266240529ed404d25d1e966728e8 100644 (file)
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -9,6 +9,11 @@
 /test/version_tmp/
 /tmp/
 
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/

diff --git a/RubyMotion.gitignore b/RubyMotion.gitignore
deleted file mode 100644 (file)
index 7e39517..0000000
--- a/RubyMotion.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-.dat*
-.repl_history
-build/
-tags
-
-# Editor files
-.DS_Store
-nbproject
-.redcar
-*.swp
-*.swo
-~
-.eprj
-vendor/Pods
-*.nib
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/