0e3b1a3373ae39565faf0b3fe1db3795e6f4d389 - emf-store/org.eclipse.emf.emfstore.other

commit: 0e3b1a3373ae39565faf0b3fe1db3795e6f4d389
[log]
author: Edgar Mueller <edgar.m.mueller@gmail.com>
Mon Oct 08 15:26:00 2012 +0200
committer: Edgar Mueller <edgar.m.mueller@gmail.com>
Mon Oct 08 15:26:00 2012 +0200
tree: e55937a183a488ab75e90a17349a83b5f335592c
parent: c176ccbf5e5898fbfca39b59a81f492eeb495f3b [diff]
parent: 4fba55be9015afbc0e27c96f9573d4c0b53188fc [diff]

Merge branch 'master' of
ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.other

Conflicts:
	org.eclipse.emf.emfstore.client.ui.errorreporting/schema/org.eclipse.emf.emfstore.ui.errorreporting.exsd
	org.eclipse.emf.emfstore.client.ui.errorreporting/src/org/eclipse/emf/emfstore/client/ui/errorreporting/ErrorReportingPreferencePage.java

tree: e55937a183a488ab75e90a17349a83b5f335592c

org.eclipse.emf.emfstore.client.backchannel/
org.eclipse.emf.emfstore.client.backchannel.example/
org.eclipse.emf.emfstore.client.proxy/
org.eclipse.emf.emfstore.client.transaction/
org.eclipse.emf.emfstore.client.ui.errorreporting/
org.eclipse.emf.emfstore.example.helloworld/
org.eclipse.emf.emfstore.example.installer/
org.eclipse.emf.emfstore.example.merging/
org.eclipse.emf.emfstore.example.sessionprovider/
org.eclipse.emf.emfstore.examplemodel/
org.eclipse.emf.emfstore.examplemodel.ecp/
org.eclipse.emf.emfstore.examplemodel.edit/
org.eclipse.emf.emfstore.fuzzy/
org.eclipse.emf.emfstore.fuzzy.emf/
org.eclipse.emf.emfstore.fuzzy.emf.edit/
org.eclipse.emf.emfstore.fuzzy.emf.editor/
org.eclipse.emf.emfstore.fuzzy.emf.example/
org.eclipse.emf.emfstore.fuzzy.emf.test/
org.eclipse.emf.emfstore.migration.edapt/
org.eclipse.emf.emfstore.repository/
org.eclipse.emf.emfstore.server.backchannel/
org.eclipse.emf.emfstore.standalone.core/
org.eclipse.emf.emfstore.standalone.git/
org.eclipse.emf.emfstore.standalone.ui/
org.eclipse.emf.emfstore.ui.errorreporting/
.gitignore