Merge branch 'v2.0' into v2.1

Conflicts: VERSION

Merge branch 'v2.0' into v2.1
51507084 · Giovanni Bussi · 24b1fe92 · 81cc84c9 · 51507084
Commit 51507084 authored 10 years ago by Giovanni Bussi
--- a/CHANGES/v2.0.txt
+++ b/CHANGES/v2.0.txt
@@ -126,7 +126,7 @@ For developers:
 - Fixed non-ansi syntax in a few points and a non-important memory leakage.
 - Split cltools/Driver.cpp to make parallel compilation faster.

-Version 2.0.4 (xxxxx)
+Version 2.0.4 (Sep 15, 2014)
 ----------------------------------------------

 For users: