Public Git Hosting - EMFCompare2.git/commit

commit	223fb7874e850c3e8d267bd96fae09d3ee6938c7
author	Arthur Daussy <arthur.daussy@obeo.fr>
	Mon, 13 Oct 2014 13:04:58 +0000 (13 15:04 +0200)
committer	Laurent Goubet <laurent.goubet@obeo.fr>
	Tue, 14 Oct 2014 09:35:49 +0000 (14 05:35 -0400)
tree	144f93192ea653e047f647f32d95aa0975873c80	tree \| snapshot (tar.gz zip)
parent	76373a1791ad675995f70c53ddf8ad443cd7d61f	commit \| diff

Corrects labels after enhancement on conflicts label.

Change-Id: I27d7d3a62f8846b45bbd516086766026c6213ddb

Eclipse foundation framework to comapre EMF models

plugins/org.eclipse.emf.compare.q7.tests/contexts/preferences/MatchEngineConfigurationWorkspaceContext.ctx		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.q7.tests/q7.properties		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc004_trees_under_groups.test		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc005_by_side_conflicts.test		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.q7.tests/tests/groups/ts004_tc007_group_item_double_click.test		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.q7.tests/tests/preferences/ts016_tc004_match_engine_configuration_never.test		diff \| blob \| blame \| history