Commit Graph

4 Commits

Author SHA1 Message Date
Chris Eppstein
8a59e34ec8 Merge branch 'stable'
* stable:
  Fix broken test.
  tests for padding free horizontal list.
  Update tests for charset changes.
  Fix test failure in ruby 1.9.2
  fix some gem issues
  Option for horizontal-list to skip padding.
  rake examples was getting a non-existent branch. Default to master.
  update changelog
  Make it easier to disable the asset cache buster.
  Turns out that IE6 & 7 don't support this.
  Fixed typo.
  HTML5 reset includes box-model reset for newer browsers.
  Added @charset declaration to force UTF-8 encoding on systems with different default encodings
  Some doc modifications.

Conflicts:
	Gemfile
	doc-src/content/CHANGELOG.markdown
	lib/compass/app_integration/rails/installer.rb
2010-10-11 02:18:26 -07:00
Chris Eppstein
822f35148b Use the new Sass gem now. 2010-10-11 02:15:14 -07:00
Chris Eppstein
0a07211286 fix some gem issues 2010-10-11 01:51:19 -07:00
Chris Eppstein
13055f4731 Gemfiles for testing and a rails test helper that works for both rails 2 and rails 3. 2010-08-28 13:58:08 -07:00