Merge branch 'master' into edge

This commit is contained in:
Jamon Holmgren
2013-08-19 20:48:00 -07:00

View File

@@ -5,8 +5,9 @@ end
require "ProMotion/version"
Motion::Project::App.setup do |app|
app.detect_dependencies = true
original_files = app.files
delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate/delegate.rb')
promotion_files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(delegate).to_a
app.files = (promotion_files << delegate) + original_files
end
end