Merge remote branch 'origin/ysn/doc_update_740'

author vsr <vsr@opencascade.com>

Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)

committer vsr <vsr@opencascade.com>

Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)
author vsr <vsr@opencascade.com>
Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)
committer vsr <vsr@opencascade.com>
Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)
diff --cc doc/salome/gui/SMESH/input/1d_meshing_hypo.doc
Simple merge
author	vsr <vsr@opencascade.com>
	Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)
committer	vsr <vsr@opencascade.com>
	Wed, 7 May 2014 12:29:05 +0000 (16:29 +0400)