Merging fixes into the trunk:

Revision: [4796]
Removing comments from Set::merge()

Revision: [4795]
Adding fix for Ticket #2353

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4798 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-04-05 21:40:37 +00:00
parent 924a235ec3
commit 48f3349c9a
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.4794alpha
1.2.0.4798alpha

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.4794alpha';
$config['Cake.version'] = '1.2.0.4798alpha';
?>