Merge branch 'stable' of git://github.com/nex3/haml into stable

Conflicts: doc-src/HAML_CHANGELOG.md
jhenry · Sep 28, 2009 · 812e728 · 812e728
2 parents e1a9fd6 + dd250ff
commit 812e728
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/doc-src/HAML_CHANGELOG.md b/doc-src/HAML_CHANGELOG.md
@@ -12,6 +12,8 @@
   as apparently happens sometimes in TextMate
   (thanks to [Karl Varga](http://github.com/kjvarga).
 
+* Add "Sass" to the `--version` string for the executables.
+
 * Raise an exception when commas are omitted in static attributes
   (e.g. `%p{:foo => "bar" :baz => "bang"}`).
 

diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -9,6 +9,8 @@
   as apparently happens sometimes in TextMate
   (thanks to [Karl Varga](http://github.com/kjvarga).
 
+* Add "Sass" to the `--version` string for the executables.
+
 ## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
 
 There were no changes made to Sass between versions 2.2.4 and 2.2.5.

diff --git a/lib/haml/exec.rb b/lib/haml/exec.rb
@@ -73,7 +73,7 @@ def set_opts(opts)
         end
 
         opts.on_tail("-v", "--version", "Print version") do
-          puts("Haml #{::Haml.version[:string]}")
+          puts("Haml/Sass #{::Haml.version[:string]}")
           exit
         end
       end