compass/test
Chris Eppstein 000e4e1ed7 Merge branch 'master' into rails31
* master: (23 commits)
  updated change log
  fixed horizontal height and width calculation
  horizontal layout now respects positions and spacing correctly
  Changed the descriptions of the sin, cos, and tan to be more descriptive.
  derp double require
  smart pack docs - forgot something
  smart pack docs
  smart packing implimentation thanks @johnbintz
  tests for smart packing
  smart packing helper classes
  new tests
  docs for diagonal layout
  layout for diagonal sprite
  added test for diagonal layout
  fixed trig functions closes #498
  patched image functions to accept a real path
  Fix failing test for change to http_path in rails
  Failing test for changing http_path with rails
  reverted sorting back to one liner
  more importer tests
  ...

Conflicts:
	Gemfile.lock
2011-08-19 14:42:42 -07:00
..
fixtures new tests 2011-08-02 23:34:59 -04:00
helpers fixed features 2011-04-28 10:13:38 -04:00
integrations merge 2011-07-25 22:47:29 -04:00
units Merge branch 'master' into rails31 2011-08-19 14:42:42 -07:00
test_helper.rb abstracted out test helpers 2011-07-26 16:20:51 -04:00