diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /.gitignore | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
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 | ||