Merge with 9175edf9b490c5cbd9bd099993f6cf1829f6a045
authorveltr
Thu, 06 Dec 2012 14:30:48 +0100
changeset 130 93d63d88f4f7
parent 129 ff6c954f3aaa (current diff)
parent 128 9175edf9b490 (diff)
child 131 e2d1478c843f
Merge with 9175edf9b490c5cbd9bd099993f6cf1829f6a045
--- a/.hgtags	Thu Dec 06 14:30:23 2012 +0100
+++ b/.hgtags	Thu Dec 06 14:30:48 2012 +0100
@@ -2,3 +2,6 @@
 1ff26abadd905caf575d6d78aa0a9e47067a3422 V00.02
 c75713e9cc922a3e11b9d353da04bbaa219f3588 V00.03
 39f8718d496c7b42ab12278423b389f9ccac02d4 V00.04
+265415212a4cf0baa4f346bd074808e53fb8fe29 V00.05
+265415212a4cf0baa4f346bd074808e53fb8fe29 V00.05
+c4e4936ac9c94ae8fc75266dc7cb49c15f2eb6c7 V00.05
--- a/src/hashcut/__init__.py	Thu Dec 06 14:30:23 2012 +0100
+++ b/src/hashcut/__init__.py	Thu Dec 06 14:30:48 2012 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 4, 0, "final", 0)
+VERSION = (0, 5, 0, "final", 0)
 
 
 def get_version():
--- a/src/setup.py	Thu Dec 06 14:30:23 2012 +0100
+++ b/src/setup.py	Thu Dec 06 14:30:48 2012 +0100
@@ -5,7 +5,7 @@
 import sys
 
 MODULE = 'hashcut'
-README_PATH = 'README.md'
+README_PATH = 'README'
 
 class osx_install_data(install_data):
     # On MacOS, the platform-specific lib dir is /System/Library/Framework/Python/.../