Merge

2014-07-24 19:50:37 +04:00
parent c2f82eefc0
commit 1f3b5a4c29
14 changed files with 182 additions and 34 deletions
@@ -22,6 +22,7 @@ nbproject
 *~
 js.files
 core
+**.orig

 # ctags and ID database
 tags