resolved conflicts while merging the branch 1.9.7.x into master.

2024-10-13 00:29:41 +00:00 · 2016-05-31 15:43:07 -07:00
parent b603282bd6 bf47ba9529
commit d6a8907fc0
3 changed files with 23 additions and 1 deletions
--- a/util/ver
+++ b/util/ver
@ -1,7 +1,7 @@
 #!/bin/bash

 main_ver=1.9.15
-minor_ver=1rc2
+minor_ver=1rc2.1
 version=$main_ver.$minor_ver
 echo $version