Merge with 498fb7ca23b99772f8960b52df6357b427061a9c
authorrougeronj
Mon, 01 Dec 2014 10:34:53 +0100
changeset 380 58bc48201d0e
parent 379 ea3173079318 (current diff)
parent 377 498fb7ca23b9 (diff)
child 381 33c56d713704
child 384 83adb3fd0efd
Merge with 498fb7ca23b99772f8960b52df6357b427061a9c
.pydevproject
--- a/.hgtags	Mon Dec 01 10:30:11 2014 +0100
+++ b/.hgtags	Mon Dec 01 10:34:53 2014 +0100
@@ -77,3 +77,4 @@
 bf1198bc533bb05ff09a7287183fc19a9f800b29 V03.00-alpha.01
 a1b85604132c732e2cac932972efd5c85df008ed V03.00-alpha.01
 7f0540d0436ac9894a8f07efe57667b60e4f4297 V03.00-alpha.02
+c7ede051639b6a5885c029e0981536acb945f5bb V03.00-alpha.03
--- a/.pydevproject	Mon Dec 01 10:30:11 2014 +0100
+++ b/.pydevproject	Mon Dec 01 10:34:53 2014 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_hdalab</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/${PROJECT_DIR_NAME}/src</path>
--- a/src/hdalab/__init__.py	Mon Dec 01 10:30:11 2014 +0100
+++ b/src/hdalab/__init__.py	Mon Dec 01 10:34:53 2014 +0100
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 0, "alpha", 2)
+VERSION = (3, 0, 0, "alpha", 3)
 
 
 def get_version():