Merge branch 'master' of github.com:chriseppstein/compass into rails31

2011-08-19 19:58:00 -04:00 · 2011-08-19 19:58:00 -04:00 · 8a407a6df7
commit 8a407a6df7
parent 000e4e1ed7 4187f88970
1 changed files with 1 additions and 1 deletions
--- a/lib/compass/sprite_importer.rb
+++ b/lib/compass/sprite_importer.rb
@ -7,7 +7,7 @@ module Compass
    # finds all sprite files
    def self.find_all_sprite_map_files(path)
      hex = "[0-9a-f]"
-      glob = "*-{,s}#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
+      glob = "*-s#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
      Dir.glob(File.join(path, "**", glob))
    end