[Phpbb-checkins] r10270 - in /branches/phpBB-3_0_6/phpBB: ./ install/database_update.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sat Nov 14 23:00:30 2009
New Revision: 10270

Log:
merge  r10269

Modified:
    branches/phpBB-3_0_6/phpBB/   (props changed)
    branches/phpBB-3_0_6/phpBB/install/database_update.php

Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Nov 14 23:00:30 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269

Modified: branches/phpBB-3_0_6/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_6/phpBB/install/database_update.php Sat Nov 14 23:00:30 2009
***************
*** 1563,1569 ****
  		break;
  
  		// No changes from 3.0.6-RC4 to 3.0.6
! 		case '3.0.6-RC3':
  		break;
  	}
  }
--- 1563,1569 ----
  		break;
  
  		// No changes from 3.0.6-RC4 to 3.0.6
! 		case '3.0.6-RC4':
  		break;
  	}
  }