Public Git Hosting - indepmod/experimental.git/commit

Merge commit 'e013792cb0a6f218b2acd8e8cc2a771f48cd5ac6'

Conflicts:
Extensions/ExtensionMemoryIndicator/src/cz/cvut/promod/memory/MemoryIndicatorExtension.java
IndependentModeler/src/cz/cvut/promod/IndependentModelerMain.java
IndependentModeler/src/cz/cvut/promod/gui/Modeler.java
IndependentModeler/src/cz/cvut/promod/gui/projectNavigation/ProjectNavigation.java
IndependentModeler/src/cz/cvut/promod/gui/settings/utils/BasicSettingPage.java
IndependentModeler/src/cz/cvut/promod/services/menuService/MenuControlServiceImpl.java
Plugins/EPC/ModuleEPCImageExport/src/cz/cvut/promod/epcImageExport/settings/ImageExportSettings.java

commit	96ab5692bc992ea4472b80b0c5d6d0da4d22d829
author	Martin Vejmelka <wayman@users.sourceforge.net>
	Fri, 10 Sep 2010 15:13:24 +0000 (10 17:13 +0200)
committer	Martin Vejmelka <wayman@users.sourceforge.net>
	Fri, 10 Sep 2010 15:13:24 +0000 (10 17:13 +0200)
tree	bfb40ea039a21246f0dafc03109cd7c8b069b8aa	tree \| snapshot (tar.gz zip)
parent	700f31d1f2d70dc05a9110cb4914823b10b127bb	commit \| diff
parent	e013792cb0a6f218b2acd8e8cc2a771f48cd5ac6	commit \| diff

Extensions/ExtensionMemoryIndicator/src/cz/cvut/promod/memory/MemoryIndicatorExtension.java	diff1 \|	diff2 \|	blob \| history
Plugins/EPC/ModuleEPCImageExport/src/cz/cvut/promod/epcImageExport/settings/ImageExportSettings.java	diff1 \|	diff2 \|	blob \| history