Merge branch 'V7_main' of salome:modules/gui.git into V7_main

author rnv <rnv@opencascade.com>

Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)

committer rnv <rnv@opencascade.com>

Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)
author rnv <rnv@opencascade.com>
Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)
committer rnv <rnv@opencascade.com>
Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)
diff --cc src/OCCViewer/OCCViewer_ClippingDlg.cxx
Simple merge
author	rnv <rnv@opencascade.com>
	Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)
committer	rnv <rnv@opencascade.com>
	Tue, 18 Feb 2014 11:21:15 +0000 (15:21 +0400)