Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

Conflicts:
	bin/wish/Display2/tclIndex

diff --cc bin/wish/Display2/tclIndex
index 8fd9302,b830d03..b76ffdd
--- 1/bin/wish/Display2/tclIndex
--- 2/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@@ -49,7 -46,23 +46,27 @@@ set auto_index(menuMultiRoiOKCommand) [
  set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
  set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
  set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
+ <<<<<<< HEAD
 +set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
++=======
++<<<<<<< HEAD
+ set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
+ set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
+ set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
+ set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
+ =======
+ >>>>>>> FETCH_HEAD
++>>>>>>> FETCH_HEAD
  set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
  set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
  set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@@ -131,4 -129,9 +133,13 @@@ set auto_index(sectionCreate) [list sou
  set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
  set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
  set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
++<<<<<<< HEAD
 +set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
++=======
+ set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
+ set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
+ set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
+ set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
++>>>>>>> FETCH_HEAD