diff options
| author | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
| commit | 6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch) | |
| tree | 779125b7c1fc668c02e0dfbb661494a16242c329 /.gitignore | |
| parent | f61545fd7054088efc88aafffd78e11df80d750d (diff) | |
| parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
| download | ninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -20,4 +20,5 @@ cloud/ | |||
| 20 | /.idea/scopes/scope_settings.xml | 20 | /.idea/scopes/scope_settings.xml |
| 21 | compass_app_log.txt | 21 | compass_app_log.txt |
| 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc | 22 | js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc |
| 23 | scss/.sass-cache/ \ No newline at end of file | 23 | scss/.sass-cache/ |
| 24 | js/helper-classes/RDGE/src/tools/compiler.jar | ||