| commit | b1673360a95a1298488979459587517691d3a703 | [log] [tgz] |
|---|---|---|
| author | Eric Barnes <eric@ericlbarnes.com> | Mon Dec 05 22:05:38 2011 -0500 |
| committer | Eric Barnes <eric@ericlbarnes.com> | Mon Dec 05 22:05:38 2011 -0500 |
| tree | 3341a3b19020cf97af8b4e3a8f1ef108e3912e31 | |
| parent | 5d4da1bae6f00a193db06e940cd59ebf9743b615 [diff] | |
| parent | 319cf4d4d9897a929d6d58ad1a29bcc4a85a0b42 [diff] |
Merge branch 'develop' of https://github.com/michaeljdennis/CodeIgniter into michaeljdennis-develop Conflicts: system/libraries/Image_lib.php user_guide/changelog.html