Update version to avoid merge conflicts

14 files changed, 14 insertions, 14 deletions

diff --git a/session/adodb-compress-bzip2.php b/session/adodb-compress-bzip2.php
index fdb5fb6c..3e22eb9f 100644
--- a/session/adodb-compress-bzip2.php
+++ b/session/adodb-compress-bzip2.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-compress-gzip.php b/session/adodb-compress-gzip.php
index ed8f30b2..b195cd9e 100644
--- a/session/adodb-compress-gzip.php
+++ b/session/adodb-compress-gzip.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-cryptsession.php b/session/adodb-cryptsession.php
index dcf010c8..907e6c7e 100644
--- a/session/adodb-cryptsession.php
+++ b/session/adodb-cryptsession.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-cryptsession2.php b/session/adodb-cryptsession2.php
index 78402d51..ffca1432 100644
--- a/session/adodb-cryptsession2.php
+++ b/session/adodb-cryptsession2.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-encrypt-mcrypt.php b/session/adodb-encrypt-mcrypt.php
index 63e9ab21..0495adbf 100644
--- a/session/adodb-encrypt-mcrypt.php
+++ b/session/adodb-encrypt-mcrypt.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-encrypt-md5.php b/session/adodb-encrypt-md5.php
index 5e48b998..0ce7c8d3 100644
--- a/session/adodb-encrypt-md5.php
+++ b/session/adodb-encrypt-md5.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-encrypt-secret.php b/session/adodb-encrypt-secret.php
index aa9e31a9..5bd4e930 100644
--- a/session/adodb-encrypt-secret.php
+++ b/session/adodb-encrypt-secret.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-session-clob.php b/session/adodb-session-clob.php
index a445730d..7a48ecf3 100644
--- a/session/adodb-session-clob.php
+++ b/session/adodb-session-clob.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-session-clob2.php b/session/adodb-session-clob2.php
index 5419c330..5511867d 100644
--- a/session/adodb-session-clob2.php
+++ b/session/adodb-session-clob2.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-session.php b/session/adodb-session.php
index 4a5a05d1..eab065c8 100644
--- a/session/adodb-session.php
+++ b/session/adodb-session.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/adodb-session2.php b/session/adodb-session2.php
index ef6fc109..97cd0a17 100644
--- a/session/adodb-session2.php
+++ b/session/adodb-session2.php
@@ -2,7 +2,7 @@
 
 
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
          Contributed by Ross Smith (adodb@netebb.com).
diff --git a/session/old/adodb-cryptsession.php b/session/old/adodb-cryptsession.php
index 87428c63..0517a8f7 100644
--- a/session/old/adodb-cryptsession.php
+++ b/session/old/adodb-cryptsession.php
@@ -1,6 +1,6 @@
 <?php
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
diff --git a/session/old/adodb-session-clob.php b/session/old/adodb-session-clob.php
index 6061127f..940f8716 100644
--- a/session/old/adodb-session-clob.php
+++ b/session/old/adodb-session-clob.php
@@ -1,6 +1,6 @@
 <?php
 /*
-  @version   v5.21dev  ??-???-2015
+  @version   v5.21.0-dev  ??-???-2015
   @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
   @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.
diff --git a/session/old/adodb-session.php b/session/old/adodb-session.php
index 48225589..20a36855 100644
--- a/session/old/adodb-session.php
+++ b/session/old/adodb-session.php
@@ -1,6 +1,6 @@
 <?php
 /*
-@version   v5.21dev  ??-???-2015
+@version   v5.21.0-dev  ??-???-2015
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
 @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
   Released under both BSD license and Lesser GPL library license.