Permalink
Commits on Sep 29, 2010
  1. Merge branch 'merged'

    Conflicts:
    	Rakefile
    	doc-src/HAML_CHANGELOG.md
    	lib/sass/script/funcall.rb
    nex3 committed Sep 29, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Sep 29, 2010
  3. Bump VERSION to 3.0.21.

    nex3 committed Sep 29, 2010
  4. Really fix the permissions errors.

    nex3 committed Sep 29, 2010
  5. [Sass] Fix more #options bugs.

    Closes gh-288.
    nex3 committed Sep 29, 2010
  6. Merge branch 'merged'

    nex3 committed Sep 29, 2010
  7. Merge branch 'stable' into merged

    nex3 committed Sep 29, 2010
  8. Don't use Shellwords.shellescape.

    It's not portable to old Rubies, and we don't really need it anyway.
    nex3 committed Sep 29, 2010
  9. Merge branch 'merged'

    nex3 committed Sep 29, 2010
  10. Merge branch 'stable' into merged

    nex3 committed Sep 29, 2010
  11. Revert "Set options on operands during Operation#perform."

    This reverts commit 349bc86.
    
    This commit isn't the correct fix for the bug in question.
    nex3 committed Sep 29, 2010
  12. Merge branch 'merged'

    Conflicts:
    	Rakefile
    	doc-src/HAML_CHANGELOG.md
    	extra/haml-mode.el
    	extra/sass-mode.el
    	lib/sass/script/funcall.rb
    nex3 committed Sep 29, 2010
  13. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Sep 29, 2010
  14. Bump VERSION to 3.0.20.

    nex3 committed Sep 29, 2010
  15. Bump VERSION to 3.0.19.

    nex3 committed Sep 29, 2010
  16. Merge branch 'merged'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	lib/haml/engine.rb
    	lib/haml/precompiler.rb
    	test/haml/engine_test.rb
    nex3 committed Sep 29, 2010
  17. Merge branch 'stable' into merged

    nex3 committed Sep 29, 2010
  18. [Haml] Clean up the encoding tests.

    nex3 committed Sep 29, 2010
  19. Revert "[Haml] Fix :encoding under 1.9.2."

    This reverts commit 1f320ab.
    
    Conflicts:
    
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Sep 29, 2010
Commits on Sep 27, 2010
  1. No need to use inject

    MSNexploder committed Sep 27, 2010
Commits on Sep 25, 2010
Commits on Sep 23, 2010
  1. Merge remote branch 'origin/stable' into stable

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Sep 23, 2010