Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath> and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
This commit is contained in:
committed by
Douglas Clowes
parent
86b99280d4
commit
55347984ec
@@ -12,11 +12,13 @@ monochromator=monochromator
|
||||
detector=detector
|
||||
padim0=512
|
||||
padim1=128
|
||||
column_index_name=horizontal_channel_number
|
||||
row_index_name=vertical_channel_number
|
||||
|
||||
#---------- NXentry level
|
||||
etitle=/$(entryName),NXentry/SDS title -type NX_CHAR
|
||||
program_name=/$(entryName),NXentry/SDS program_name -type NX_CHAR \
|
||||
-attr {nx_schema_release_tag,$Name: not supported by cvs2svn $} -attr {nx_schema_revision_num,$Revision: 1.11 $}
|
||||
-attr {nx_schema_release_tag,$Name: not supported by cvs2svn $} -attr {nx_schema_revision_num,$Revision: 1.12 $}
|
||||
|
||||
erun=/$(entryName),NXentry/SDS run_number -type NX_INT32 -rank 1 -dim {-1}
|
||||
estart=/$(entryName),NXentry/SDS start_time -type NX_CHAR
|
||||
|
||||
Reference in New Issue
Block a user