Scott Davis ba2b608f73 Merge branch 'master' of github.com:chriseppstein/compass into better_sprite_packing ... Conflicts: Gemfile.lock		2011-06-09 21:56:45 -04:00
..
image_row_test.rb	start work on better packing algorithm, start with scan	2011-05-16 11:30:14 -04:00
image_test.rb	merge	2011-06-07 12:01:50 -04:00
importer_test.rb	updated importer to validate that sprites are png files	2011-06-09 16:27:23 -04:00
row_fitter_test.rb	even more cleanup	2011-05-16 11:50:01 -04:00
sprite_map_test.rb	merge	2011-06-07 12:01:50 -04:00