Gina Häußge f07305ae4f Fixed a couple of merge issues, changed way Cura is called (just using "python" won't work in environments where the default python executable doesn't bring the necessary dependencies to run Cura, now using Cura startup script instead), introduced some messaging to notify UI what's going on.		2013-09-09 16:51:46 +02:00
..
app	Fixed a couple of merge issues, changed way Cura is called (just using "python" won't work in environments where the default python executable doesn't bring the necessary dependencies to run Cura, now using Cura startup script instead), introduced some messaging to notify UI what's going on.	2013-09-09 16:51:46 +02:00
lib	Replaced socket.io with SockJS	2013-08-26 17:37:13 +02:00