Merging upstream

2013-11-27 15:03:08 -05:00
parent 6ae5f35a5e a6dc172eaa
commit 412d6907bc
103 changed files with 1185 additions and 627 deletions
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@@ -1,5 +1,5 @@
 *.dcu
-*.~*~
+*.~*
 *.local
 *.identcache
 __history
@@ -11,4 +11,4 @@ __history
 *.dcp
 *.so
 *.apk
-bin/*
+bin/*