added temp files from mergetool

2015-01-16 16:28:30 -08:00 · 2015-01-16 16:28:30 -08:00 · 21cc8af683
commit 21cc8af683
parent 54e9595ae8
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -45,3 +45,5 @@ build/
 .cproject
 .settings
 .project
 *.orig