Sign in
eclipse
/
emf-store
/
org.eclipse.emf.emfstore.other
/
9ab652b47628d7b1c9709c86c7d8be86bc9a30d2
commit
9ab652b47628d7b1c9709c86c7d8be86bc9a30d2
[
log
]
author
maximilian@emfstore.org <maximilian@emfstore.org>
Sat Dec 29 01:52:19 2012 +0100
committer
maximilian@emfstore.org <maximilian@emfstore.org>
Sat Dec 29 01:52:19 2012 +0100
tree
525d6cbe0180c7c48cb83284bebc050d41213ed9
parent
7c8ac04db27f7b8f10f76a0dcbb3f8cb3072a5a7
[
diff
]
changed example to reflect new merge signature
org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
[
diff
]
1 file changed
tree: 525d6cbe0180c7c48cb83284bebc050d41213ed9
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/
.gitignore