Context Navigation

queuestaticsky.pl

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

Property svn:mergeinfo changed

/branches/bills_branches/bills_201312 (added)	merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450
/trunk (added)	merged: 36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478

r35329	r36480
33	33	};
34	34
	35	# don't update the database if we are pretending
	36	$no_update = 1 if $pretend;
35	37
36	38	my $missing_tools;
…	…
113	115	}
114	116	}
	117	last if $pretend; # only do the first (full) set if we are in pretend mode
115	118	}
116	119	{

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