Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 28 deletions

diff --git a/cores/robot/new.cpp b/cores/robot/new.cpp
deleted file mode 100644
index b81031e..0000000
--- a/cores/robot/new.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <new.h>
-
-void * operator new(size_t size)
-{
-  return malloc(size);
-}
-
-void * operator new[](size_t size)
-{
-  return malloc(size);
-}
-
-void operator delete(void * ptr)
-{
-  free(ptr);
-}
-
-void operator delete[](void * ptr)
-{
-  free(ptr);
-}
-
-int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);};
-void __cxa_guard_release (__guard *g) {*(char *)g = 1;};
-void __cxa_guard_abort (__guard *) {}; 
-
-void __cxa_pure_virtual(void) {};
-