<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>bin/sdoc-merge</filename>
    </added>
    <added>
      <filename>lib/sdoc/merge.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -4,4 +4,4 @@ See online on railsapi.com
 
 == Usage
 sudo gem install voloko-sdoc --source http://gems.github.com
-sdoc --github_url http://github.com/yourname/yourproject -S projectdir
\ No newline at end of file
+sdoc -N projectdir
\ No newline at end of file</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -24,8 +24,8 @@ class RDoc::Generator::SHtml
   GENERATOR_DIRS = [File.join('sdoc', 'generator'), File.join('rdoc', 'generator')]
   
   # Used in js to reduce index sizes
-  TYPE_METHOD = 1
-  TYPE_CLASS  = 2
+  TYPE_CLASS  = 1
+  TYPE_METHOD = 2
   TYPE_FILE   = 3
   
   TREE_FILE = File.join 'panel', 'tree.js'</diff>
      <filename>lib/sdoc/generator/shtml.rb</filename>
    </modified>
    <modified>
      <diff>@@ -402,7 +402,7 @@ Searchdoc.Panel.prototype = $.extend({}, Searchdoc.Navigation, new function() {
         html += '&lt;h1&gt;' + hlt(result.title);
         if (result.params) html += '&lt;i&gt;' + result.params + '&lt;/i&gt;&lt;/h1&gt;';
         html += '&lt;p&gt;';
-        if (badge) {
+        if (typeof badge != 'undefined') {
             badge = badge % 6;
             html += '&lt;span class=&quot;badge badge_' + (badge + 1) + '&quot;&gt;' + escapeHTML(this.data.badges[badge] || 'unknown') + '&lt;/span&gt;';
         }</diff>
      <filename>lib/sdoc/generator/template/shtml/resources/js/searchdoc.js</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = &quot;RDoc extensions for searchable html generations&quot;
   s.files = %w(lib/sdoc/generator/shtml.rb lib/sdoc/generator/template/shtml/_context.rhtml lib/sdoc/generator/template/shtml/class.rhtml lib/sdoc/generator/template/shtml/file.rhtml lib/sdoc/generator/template/shtml/index.rhtml lib/sdoc/generator/template/shtml/resources/css/main.css lib/sdoc/generator/template/shtml/resources/css/panel.css lib/sdoc/generator/template/shtml/resources/css/reset.css lib/sdoc/generator/template/shtml/resources/i/arrows.png lib/sdoc/generator/template/shtml/resources/i/results_bg.png lib/sdoc/generator/template/shtml/resources/i/tree_bg.png lib/sdoc/generator/template/shtml/resources/js/jquery-1.3.2.min.js lib/sdoc/generator/template/shtml/resources/js/main.js lib/sdoc/generator/template/shtml/resources/js/searchdoc.js lib/sdoc/generator/template/shtml/resources/panel/index.html lib/sdoc/generator/template/shtml/shtml.rb lib/sdoc/github.rb lib/sdoc.rb rdoc/bin/rdoc rdoc/bin/ri rdoc/History.txt rdoc/lib/rdoc/alias.rb rdoc/lib/rdoc/anon_class.rb rdoc/lib/rdoc/any_method.rb rdoc/lib/rdoc/attr.rb rdoc/lib/rdoc/cache.rb rdoc/lib/rdoc/class_module.rb rdoc/lib/rdoc/code_object.rb rdoc/lib/rdoc/code_objects.rb rdoc/lib/rdoc/constant.rb rdoc/lib/rdoc/context.rb rdoc/lib/rdoc/diagram.rb rdoc/lib/rdoc/dot.rb rdoc/lib/rdoc/generator/darkfish.rb rdoc/lib/rdoc/generator/markup.rb rdoc/lib/rdoc/generator/ri.rb rdoc/lib/rdoc/generator/template/darkfish/classpage.rhtml rdoc/lib/rdoc/generator/template/darkfish/filepage.rhtml rdoc/lib/rdoc/generator/template/darkfish/images/brick.png rdoc/lib/rdoc/generator/template/darkfish/images/brick_link.png rdoc/lib/rdoc/generator/template/darkfish/images/bug.png rdoc/lib/rdoc/generator/template/darkfish/images/bullet_black.png rdoc/lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png rdoc/lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png rdoc/lib/rdoc/generator/template/darkfish/images/date.png rdoc/lib/rdoc/generator/template/darkfish/images/find.png rdoc/lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif rdoc/lib/rdoc/generator/template/darkfish/images/macFFBgHack.png rdoc/lib/rdoc/generator/template/darkfish/images/package.png rdoc/lib/rdoc/generator/template/darkfish/images/page_green.png rdoc/lib/rdoc/generator/template/darkfish/images/page_white_text.png rdoc/lib/rdoc/generator/template/darkfish/images/page_white_width.png rdoc/lib/rdoc/generator/template/darkfish/images/plugin.png rdoc/lib/rdoc/generator/template/darkfish/images/ruby.png rdoc/lib/rdoc/generator/template/darkfish/images/tag_green.png rdoc/lib/rdoc/generator/template/darkfish/images/wrench.png rdoc/lib/rdoc/generator/template/darkfish/images/wrench_orange.png rdoc/lib/rdoc/generator/template/darkfish/images/zoom.png rdoc/lib/rdoc/generator/template/darkfish/index.rhtml rdoc/lib/rdoc/generator/template/darkfish/js/darkfish.js rdoc/lib/rdoc/generator/template/darkfish/js/jquery.js rdoc/lib/rdoc/generator/template/darkfish/js/quicksearch.js rdoc/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js rdoc/lib/rdoc/generator/template/darkfish/rdoc.css rdoc/lib/rdoc/generator.rb rdoc/lib/rdoc/ghost_method.rb rdoc/lib/rdoc/include.rb rdoc/lib/rdoc/known_classes.rb rdoc/lib/rdoc/markup/attribute_manager.rb rdoc/lib/rdoc/markup/formatter.rb rdoc/lib/rdoc/markup/fragments.rb rdoc/lib/rdoc/markup/inline.rb rdoc/lib/rdoc/markup/lines.rb rdoc/lib/rdoc/markup/preprocess.rb rdoc/lib/rdoc/markup/to_flow.rb rdoc/lib/rdoc/markup/to_html.rb rdoc/lib/rdoc/markup/to_html_crossref.rb rdoc/lib/rdoc/markup/to_latex.rb rdoc/lib/rdoc/markup/to_test.rb rdoc/lib/rdoc/markup/to_texinfo.rb rdoc/lib/rdoc/markup.rb rdoc/lib/rdoc/meta_method.rb rdoc/lib/rdoc/normal_class.rb rdoc/lib/rdoc/normal_module.rb rdoc/lib/rdoc/options.rb rdoc/lib/rdoc/parser/c.rb rdoc/lib/rdoc/parser/perl.rb rdoc/lib/rdoc/parser/ruby.rb rdoc/lib/rdoc/parser/simple.rb rdoc/lib/rdoc/parser.rb rdoc/lib/rdoc/rdoc.rb rdoc/lib/rdoc/require.rb rdoc/lib/rdoc/ri/cache.rb rdoc/lib/rdoc/ri/descriptions.rb rdoc/lib/rdoc/ri/display.rb rdoc/lib/rdoc/ri/driver.rb rdoc/lib/rdoc/ri/formatter.rb rdoc/lib/rdoc/ri/paths.rb rdoc/lib/rdoc/ri/reader.rb rdoc/lib/rdoc/ri/util.rb rdoc/lib/rdoc/ri/writer.rb rdoc/lib/rdoc/ri.rb rdoc/lib/rdoc/single_class.rb rdoc/lib/rdoc/stats.rb rdoc/lib/rdoc/task.rb rdoc/lib/rdoc/tokenstream.rb rdoc/lib/rdoc/top_level.rb rdoc/lib/rdoc.rb rdoc/Manifest.txt rdoc/Rakefile rdoc/README.txt rdoc/RI.txt)
-  s.executables = ['sdoc']
+  s.executables = ['sdoc', 'sdoc-merge']
   s.bindir = 'bin'
   s.require_path = &quot;lib&quot;
   s.has_rdoc = true</diff>
      <filename>sdoc.gemspec</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>84d038e520ccf0c011071686d09c7ebb5e15b27f</id>
    </parent>
  </parents>
  <author>
    <name>Volodya Kolesnikov</name>
    <email>voloko@gmail.com</email>
  </author>
  <url>http://github.com/voloko/sdoc/commit/0ecbff96c9c6c854a7a7577a39e57ca951e12bfd</url>
  <id>0ecbff96c9c6c854a7a7577a39e57ca951e12bfd</id>
  <committed-date>2009-03-29T15:36:25-07:00</committed-date>
  <authored-date>2009-03-29T15:36:25-07:00</authored-date>
  <message>Merge docs</message>
  <tree>1356885d3d5a44b65f7606a24214e60c42e2315d</tree>
  <committer>
    <name>Volodya Kolesnikov</name>
    <email>voloko@gmail.com</email>
  </committer>
</commit>
