diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-10-17 11:27:49 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-10-17 11:27:49 -0300 |
commit | 9f7506cd11f6b2625f57d1effd988271e898bf05 (patch) | |
tree | 1a9ab8c518f1d71cc87ab1800649ffd9a62ac8d6 /.gitignore | |
parent | 0c2567096393f9a8fa86e0e7d8460ccca15756d7 (diff) | |
parent | a057c79a7954be6b6d78e02e009e2d717010a8b7 (diff) |
Merge remote-tracking branch 'ivan/feature/3925_automate-i18n' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -29,3 +29,5 @@ MANIFEST _trial_temp* config/* CHANGELOG~ + +data/bitmask.pro |