Merge remote-tracking branch 'upstream/stable' into merge_stable

# Conflicts: # test/runnable/template9.d
dlang · Oct 7, 2015 · 8f0db5a · 8f0db5a
2 parents 5e73c30 + f8d24cd
commit 8f0db5a
Show file tree

Hide file tree

Showing 20 changed files with 297 additions and 95 deletions.
diff --git a/src/declaration.d b/src/declaration.d
@@ -1898,7 +1898,7 @@ public:
         sem = Semantic2Done;
     }
 
-    override final const(char)* kind()
+    override const(char)* kind()
     {
         return "variable";
     }