Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 46 insertions, 0 deletions

diff --git a/vendor/gems/rdoc-2.4.3/test/xref_data.rb b/vendor/gems/rdoc-2.4.3/test/xref_data.rb
new file mode 100644
index 000000000..5d7e42bc2
--- /dev/null
+++ b/vendor/gems/rdoc-2.4.3/test/xref_data.rb
@@ -0,0 +1,46 @@
+XREF_DATA = <<-XREF_DATA
+class C1
+
+  attr :attr
+  attr_reader :attr_reader
+  attr_writer :attr_writer
+  attr_accessor :attr_accessor
+
+  CONST = :const
+
+  def self.m
+  end
+
+  def m
+  end
+end
+
+class C2
+  class C3
+    def m
+    end
+
+    class H1
+      def m?
+      end
+    end
+  end
+end
+
+class C3
+  class H1
+  end
+
+  class H2
+  end
+end
+
+class C4
+  class C4
+  end
+end
+
+module M1
+end
+XREF_DATA
+