Upstream merge

author Ferdi van der Werf <efcm@vdwerf.eu>

Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)

committer Ferdi van der Werf <efcm@vdwerf.eu>

Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)
author Ferdi van der Werf <efcm@vdwerf.eu>
Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)
committer Ferdi van der Werf <efcm@vdwerf.eu>
Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)
diff --cc .gitignore

index 64e40d53925ac2a0d502c1f4fb518ff82aa8850d,417c7e31f1c97dc01308ba27fcfdd4a67d6589cb..aca6813f0e3a196d43ff21abed75020968bcd201
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -3,9 -3,7 +3,9 @@@
   *.pyc
   *.zip
   *.exe
- osx64-Cura-NewUI*
- win32-Cura-NewUI*
- linux-Cura-NewUI*
+ osx64-Cura-*
+ win32-Cura-*
+ linux-Cura-*
- -Printrun
+ +Printrun
+ +.idea
+ +.DS_Store
author	Ferdi van der Werf <efcm@vdwerf.eu>
	Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)
committer	Ferdi van der Werf <efcm@vdwerf.eu>
	Sun, 8 Apr 2012 20:43:39 +0000 (22:43 +0200)