diff options
| author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
| commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
| tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels/color/colortoolbar.reel/config.rb | |
| parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
| parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
| download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color/colortoolbar.reel/config.rb')
| -rwxr-xr-x | js/panels/color/colortoolbar.reel/config.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/js/panels/color/colortoolbar.reel/config.rb b/js/panels/color/colortoolbar.reel/config.rb deleted file mode 100755 index 9b55af19..00000000 --- a/js/panels/color/colortoolbar.reel/config.rb +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | # Require any additional compass plugins here. | ||
| 2 | # Set this to the root of your project when deployed: | ||
| 3 | http_path = "/" | ||
| 4 | css_dir = "css" | ||
| 5 | sass_dir = "css" | ||
| 6 | images_dir = "img" | ||
| 7 | javascripts_dir = "../" | ||
| 8 | # To enable relative paths to assets via compass helper functions. Uncomment: | ||
| 9 | # relative_assets = true | ||