Context Navigation

destreakFile.d

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

Property svn:mergeinfo changed

/branches/pap_stack (added)	merged: 27401,27405-27406,27409-27416
/trunk (added)	merged: 27088-27260,27262,27273-27280,27282-27290,27293-27294,27297-27304,27307-27311,27313-27335,27341-27349,27354-27356,27358-27367,27369-27371,27387-27389,27391-27396,27399-27400,27402-27404,27407-27408,27417-27420,27426-27427,27431-27436,27438-27439,27441-27486,27491,27503-27506,27510-27512

r26947	r27517
9	9	FIELD magicDSFile.backup_path_base, 5, %s, Backup Path
10	10	FIELD magicDSFile.recovery_path_base, 5, %s, Recovery Path
11		FIELD magicDSFile.fault, 5, %s, Fault
	11	FIELD magicDSFile.fault, 5, %d, Fault
12	12	FIELD magicDSFile.data_state, 5, %s, Data State

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