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
..
bad_extensions	updated importer to validate that sprites are png files	2011-06-09 16:27:23 -04:00
colors	forgot test files	2011-05-10 21:57:43 -04:00
image_row	test files	2011-05-16 09:36:27 -04:00
ko	sprite tests moved over	2011-04-28 00:00:54 -04:00
nested/squares	sprite tests moved over	2011-04-28 00:00:54 -04:00
prefix	sprite tests moved over	2011-04-28 00:00:54 -04:00
selectors	sprite tests moved over	2011-04-28 00:00:54 -04:00
squares	sprite tests moved over	2011-04-28 00:00:54 -04:00