Context Navigation

Changeset 1547

Timestamp:

Apr 26, 2010, 6:08:36 PM (14 years ago)

Author:

ezyang

Message:

Merge adehnert's phpical changes, update mergeinfo.

Location:

trunk/locker/deploy/bin

Files:

trunk/locker/deploy/bin
- Property svn:mergeinfo set to False
  /branches/fc11-dev/locker/deploy/bin merged eligible
  /branches/locker-dev/locker/deploy/bin merged eligible

r1222	r1547
12	12	close(FILE);
13	13	$a =~ s/adminpass/$admin_password/g;
	14	$a =~ s\|\$timezone\s*= '';\|\$timezone = 'US/Eastern';\|g;
14	15	$a =~ s/\$phpicalendar_publishing/\/\/ WARNING: The scripts.mit.edu maintainers have had to disable this feature on scripts.mit.edu because it contains a serious security vulnerability that has not been addressed by the software\'s authors. Please do not try to enable this feature\n\$phpicalendar_publishing/;
15	16	open(FILE, ">config.inc.php");

trunk/locker/deploy/bin/trac
- Property svn:mergeinfo changed
  /branches/locker-dev/locker/deploy/bin/trac merged: 1223,1262

Property svn:mergeinfo

old	new
1	1	/branches/fc11-dev/locker/deploy/bin/turbogears:1121-1258
2		/branches/locker-dev/locker/deploy/bin/turbogears:1478
	2	/branches/locker-dev/locker/deploy/bin/turbogears:1221-1297,1478

Note: See TracChangeset for help on using the changeset viewer.

/branches/fc11-dev/locker/deploy/bin	merged	eligible
/branches/locker-dev/locker/deploy/bin	merged	eligible