From 41feebfbd00aaa62074a94f49e989ce2b7ccc07e Mon Sep 17 00:00:00 2001
From: Carl Suster <code@contraflo.ws>
Date: Fri, 7 Mar 2014 00:15:40 +1100
Subject: [PATCH] Merge RubyMotion into Ruby

---
 Ruby.gitignore       |  5 +++++
 RubyMotion.gitignore | 20 --------------------
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 RubyMotion.gitignore

diff --git a/Ruby.gitignore b/Ruby.gitignore
index 99e72c12..f2c13607 100644
--- 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
index 7e395179..00000000
--- 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/