Permalink
Commits on Nov 19, 2010
  1. Merge remote branch 'haml/merged' into merged

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
  3. Merge remote branch 'haml/stable' into stable

    Conflicts:
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 19, 2010
Commits on Nov 17, 2010
Commits on Nov 16, 2010
  1. Merge branch 'stable' into merged

    nex3 committed Nov 16, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Nov 16, 2010
  3. Bump VERSION to 3.0.24.

    nex3 committed Nov 16, 2010
Commits on Nov 9, 2010
Commits on Oct 31, 2010
  1. Merge branch 'stable' into merged

    nex3 committed Oct 31, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	VERSION
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Oct 31, 2010
  3. Bump VERSION to 3.0.23.

    nex3 committed Oct 31, 2010
  4. Merge branch 'stable' into merged

    nex3 committed Oct 31, 2010
  5. Merge remote branch 'haml/stable' into stable

    Closes gh-1
    nex3 committed Oct 31, 2010
  6. Merge branch 'stable' into merged

    Conflicts:
    	lib/sass/plugin.rb
    nex3 committed Oct 31, 2010
Commits on Oct 27, 2010
  1. Merge branch 'stable' into merged

    nex3 committed Oct 27, 2010
  2. Fix a bug with combining old and new attrs.

    This also means that old attrs always take precedence over new.
    nex3 committed Oct 27, 2010
Commits on Oct 26, 2010
  1. Merge branch 'stable' into merged

    nex3 committed Oct 26, 2010
  2. Merge branch 'stable' into merged

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	doc-src/SASS_CHANGELOG.md
    nex3 committed Oct 26, 2010