git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into subtree
[fanfix.git]
/
VERSION
diff --git
a/VERSION
b/VERSION
index 6016e8addc4d0ea9fab0f803ecb49f93541fd44f..47ae1f7823d77b8b3c60cdd0e303f0cb5dd24286 100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-4.6.0
+3.1.2-dev