summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJustyna Att Ilczuk <justyna.ilczuk@gmail.com>2012-12-09 13:07:34 +0100
committerJustyna Att Ilczuk <justyna.ilczuk@gmail.com>2012-12-09 13:07:34 +0100
commit39488ed535dfc2678f4f7dfc523081eea90d7a88 (patch)
tree2c10fdfae999ea774a287964a17238a7cc81ebf5 /.gitignore
parent1666717f720ac93731310ee2b25ff20d64979655 (diff)
parent360171fa592b1e5d6f1c15a97135fc4e6305330d (diff)
downloadsencha-lang-39488ed535dfc2678f4f7dfc523081eea90d7a88.tar.gz
sencha-lang-39488ed535dfc2678f4f7dfc523081eea90d7a88.tar.bz2
sencha-lang-39488ed535dfc2678f4f7dfc523081eea90d7a88.tar.xz
sencha-lang-39488ed535dfc2678f4f7dfc523081eea90d7a88.zip
Merge branch 'devel'
Conflicts: .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index fd2f740..14a8851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Sencha-lang/Debug/*
Sencha-lang/Release/*
+*.o