Merging changes and enhancements into the trunk:

Revision: [5845] Revision: [5844] Revision: [5843] Revision: [5842] Revision: [5841] Revision: [5840]
Revision: [5839] Revision: [5838] Revision: [5837] Revision: [5836] Revision: [5835] Revision: [5834]
Revision: [5833] Revision: [5832] Revision: [5831] Revision: [5830] Revision: [5829] Revision: [5828]
Revision: [5827] Revision: [5826] Revision: [5825] Revision: [5824] Revision: [5823]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5847 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-10-22 03:39:01 +00:00
parent 7ca924d661
commit 7767bb7e3d
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.5821 pre-beta
1.2.0.5847 pre-beta

View file

@ -24,5 +24,5 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
$config['Cake.version'] = '1.2.0.5821 pre-beta';
$config['Cake.version'] = '1.2.0.5847 pre-beta';
?>