Permalink
Browse files

Bump version to 1.7.0-dev

  • Loading branch information...
1 parent 5114990 commit eab64db775f305a8d7ec7d6739ee177fd525dd5e @willdurand willdurand committed Feb 14, 2013
Showing with 18 additions and 3 deletions.
  1. +2 −0 .gitignore
  2. +4 −0 CHANGELOG
  3. +10 −1 composer.json
  4. +1 −1 generator/default.properties
  5. +1 −1 runtime/lib/Propel.php
View
@@ -7,3 +7,5 @@ test/fixtures/treetest/build/
vendor/
composer.lock
composer.phar
+generator/pear/build/
+runtime/pear/build/
View
@@ -1,5 +1,9 @@
# Changelog Of The Propel 1.6 Branch #
+## 2013-??-??: Version 1.7.0 ##
+
+n/a
+
## 2013-02-14: Version 1.6.8 ##
01ea918 Fixed #601.
View
@@ -17,10 +17,19 @@
"php": ">=5.2.4",
"phing/phing": "~2.4"
},
+ "require-dev": {
+ "pear-pear.php.net/PEAR_PackageFileManager2": "@stable"
+ },
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
+ "repositories": [
+ {
+ "type": "pear",
+ "url": "http://pear.php.net"
+ }
+ ],
"bin": ["generator/bin/propel-gen", "generator/bin/propel-gen.bat"]
}
@@ -16,7 +16,7 @@
#
# -------------------------------------------------------------------
-propel.version = 1.6.8
+propel.version = 1.7.0-dev
propel.home = .
@@ -30,7 +30,7 @@ class Propel
/**
* The Propel version.
*/
- const VERSION = '1.6.8';
+ const VERSION = '1.7.0-dev';
/**
* A constant for <code>default</code>.

0 comments on commit eab64db

Please sign in to comment.