diff options
author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
tree | c64660f7f69840cac5186fd730221335bd0a67af /_scss/config.rb | |
parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
download | ninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to '_scss/config.rb')
-rwxr-xr-x | _scss/config.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/_scss/config.rb b/_scss/config.rb deleted file mode 100755 index 23327bde..00000000 --- a/_scss/config.rb +++ /dev/null | |||
@@ -1,11 +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 = "" | ||
6 | images_dir = "../images/" | ||
7 | javascripts_dir = "../js" | ||
8 | output_style = :compact | ||
9 | line_comments = false | ||
10 | # To enable relative paths to assets via compass helper functions. Uncomment: | ||
11 | # relative_assets = true | ||