Permalink
Browse files

Merge branch 'master' into pb

Conflicts:
	notification/__init__.py
	notification/models.py
	setup.py
  • Loading branch information...
2 parents 94f0e39 + ac5ff62 commit 5f84e8c391daf05af6cc4c60a0c7ecc6585f672b @brosner brosner committed Jan 7, 2009
Showing with 9 additions and 3 deletions.
  1. +9 −2 notification/__init__.py
  2. +0 −1 setup.py
View
@@ -1,2 +1,9 @@
-VERSION = (0, 1, 'pre')
-__version__ = '.'.join(map(str, VERSION))
+VERSION = (0, 2, 0, "pre")
+
+def get_version():
+ if VERSION[3] != "final":
+ return "%s.%s.%s%s" % (VERSION[0], VERSION[1], VERSION[2], VERSION[3])
+ else:
+ return "%s.%s.%s" % (VERSION[0], VERSION[1], VERSION[2])
+
+__version__ = get_version()
View
@@ -12,7 +12,6 @@
'notification',
'notification.management',
'notification.management.commands',
- 'notification.templatetags',
],
package_dir={'notification': 'notification'},
classifiers=[

0 comments on commit 5f84e8c

Please sign in to comment.