diff options
author | Nivesh Rajbhandari | 2012-02-03 11:21:09 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-03 11:21:09 -0800 |
commit | c203ea7413b5a2b2232d7f8346cd1b9932f2575b (patch) | |
tree | 866f72ecc4af2f4a28b5f948ee9b03af2d32fce0 /.gitignore | |
parent | db73f720b692d63b55f7c773579fe23336ec0486 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-c203ea7413b5a2b2232d7f8346cd1b9932f2575b.tar.gz |
Merge branch 'refs/heads/master' into ToolFixes
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -20,4 +20,5 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78 | |||
20 | 20 | ||
21 | cloud/ | 21 | cloud/ |
22 | 22 | ||
23 | /.idea/scopes/scope_settings.xml \ No newline at end of file | 23 | /.idea/scopes/scope_settings.xml |
24 | /_scss/compass_app_log.txt \ No newline at end of file | ||