Merge branch 'master' into develop

weynhamz · weynhamz · commit 0387287ad0f0 · 2013-06-24T17:21:01.000+08:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,14 @@
+Version 0.5
+-----------
+
+* Add trait support
+  thanks to Mark Wu
+* Add inherits support
+  thanks to Mark Wu
+* Add namespace support
+  thanks to Mark Wu
+* Add instruction to enable phar extension in README
+
 Version 0.4.2
 -------------
 
diff --git a/PHPCtags.class.php b/PHPCtags.class.php
@@ -1,7 +1,7 @@
 <?php
 class PHPCtags
 {
-    const VERSION = '0.4.2';
+    const VERSION = '0.5';
 
     private $mFile;
 
