Merge branch 'release/1.14' into develop

* release/1.14: Update changelog Bump version to v1.13
canton7 · Feb 17, 2012 · 509dd1c · 509dd1c
2 parents 4ce6c42 + e9f8a08
commit 509dd1c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -4,7 +4,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2011 Antony Male

diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,11 @@ Changelog
 
 This file lists the important changes between versions. For a list of minor changes, check the log.
 
+v1.14
+-----
+ - Add gen_tags option to render_js and render_css.
+ - Fix bug with combine() and groups containing pre-minified files.
+
 v1.13
 -----
  - Add quickref.md -- ideal for quickly accessing the API, assuming you know roughly what you're looking for.

diff --git a/classes/casset.php b/classes/casset.php
@@ -4,7 +4,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2011 Antony Male

diff --git a/classes/casset/csscompressor.php b/classes/casset/csscompressor.php
@@ -17,7 +17,7 @@
  * This library is used as part of Casset.
  *
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/classes/casset/cssurirewriter.php b/classes/casset/cssurirewriter.php
@@ -10,7 +10,7 @@
  * This library is used as part of Casset.
  *
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/classes/casset/jsmin.php b/classes/casset/jsmin.php
@@ -52,7 +52,7 @@
 /**
  * This library is used as part of Casset.
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @link       http://github.com/canton7/fuelphp-casset

diff --git a/config/casset.php b/config/casset.php
@@ -3,7 +3,7 @@
  * Casset: Convenient asset library for FuelPHP.
  *
  * @package    Casset
- * @version    v1.13
+ * @version    v1.14
  * @author     Antony Male
  * @license    MIT License
  * @copyright  2011 Antony Male