From: Ferdi van der Werf <efcm@vdwerf.eu>
Date: Sun, 8 Apr 2012 20:43:39 +0000 (+0200)
Subject: Upstream merge
X-Git-Tag: RC3~91^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e2f4ce4ef6e63f805f1a209dcdb5f74477a08b65;p=cura.git

Upstream merge
---

e2f4ce4ef6e63f805f1a209dcdb5f74477a08b65
diff --cc .gitignore
index 64e40d53,417c7e31..aca6813f
--- a/.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