Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
@@ -1,10 +0,0 @@
--- qucs-core/configure.orig	2011-07-03 07:34:09.069218113 -0500
-+++ qucs-core/configure	2011-07-03 07:34:46.618990497 -0500
-@@ -5884,7 +5884,6 @@
- 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-#include <tr1/complex>
- using namespace std;
- using namespace std::tr1;
- int