Merge branch 'master' into abn/paravis_rearch

author abn <adrien.bruneton@cea.fr>

Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)

committer abn <adrien.bruneton@cea.fr>

Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)
author abn <adrien.bruneton@cea.fr>
Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)
committer abn <adrien.bruneton@cea.fr>
Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)
diff --cc src/LightApp/LightApp_Application.cxx
Simple merge
diff --cc src/LightApp/resources/LightApp.xml
Simple merge
diff --cc src/LightApp/resources/LightApp_msg_en.ts
Simple merge
author	abn <adrien.bruneton@cea.fr>
	Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)
committer	abn <adrien.bruneton@cea.fr>
	Tue, 7 Oct 2014 09:37:05 +0000 (11:37 +0200)
		1	2
src/LightApp/LightApp_Application.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/LightApp/resources/LightApp.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/LightApp/resources/LightApp_msg_en.ts	patch \|	diff1 \|	diff2 \|	blob \| history