diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
| commit | 6a93d027e744bfc4ab2f8f7808ee99c770003481 (patch) | |
| tree | b8bfe4e93e2314c8c7c9b95e99a861d8fad6b05f /script/performance | |
| parent | 48bbe41b36402a22b808ec860c1a84673b74527f (diff) | |
| parent | b06195a428b5cb6c3e95b07c631e2f18febf05f0 (diff) | |
Merge branch 'release/0.5' into wdtk
Conflicts:
.gitignore
Diffstat (limited to 'script/performance')
| -rwxr-xr-x | script/performance/benchmarker | 2 | ||||
| -rwxr-xr-x | script/performance/profiler | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/script/performance/benchmarker b/script/performance/benchmarker index c2441c941..a94253aba 100755 --- a/script/performance/benchmarker +++ b/script/performance/benchmarker @@ -1,5 +1,3 @@ -#!/usr/bin/ruby - #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../config/boot.rb' require 'commands/performance/benchmarker' diff --git a/script/performance/profiler b/script/performance/profiler index a7ea37a9a..e9e5b071d 100755 --- a/script/performance/profiler +++ b/script/performance/profiler @@ -1,5 +1,3 @@ -#!/usr/bin/ruby - #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../config/boot.rb' require 'commands/performance/profiler' |