?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 5fe0d1a) | patch
[Doc] Update user-guide21/49621/2
commit9203ea9993d2f8235dadac1393bb0a8530728a85
authorAxel Richard <axel.richard@obeo.fr>
Tue, 2 Jun 2015 09:49:11 +0000 (2 11:49 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Mon, 8 Jun 2015 08:06:43 +0000 (8 10:06 +0200)
tree8ce47f230883ea218d0c013e5a815a3d98d98421tree | snapshot (tar.gz zip)
parent5fe0d1a763ad3ae7d9c7a210671c70e9ed6269abcommit | diff
[Doc] Update user-guide

-Switch section order
-Update images
-Update know bugs section
-Remove old EMF Compare 1.3 demos
-Add contextual menu section
-Add Merge actions recap section

Change-Id: I3db53966e89831092cac026bc23e00e3b45a34af
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
plugins/org.eclipse.emf.compare.doc/src/images/EMF_Compare_ContextualMenu_Differences.png [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/EMF_Compare_ContextualMenu_Differences_02.png [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/EMF_Compare_Handling_Conflict_1.png diff | blob | blame | history
plugins/org.eclipse.emf.compare.doc/src/images/EMF_Compare_Handling_Conflict_2.png diff | blob | blame | history
plugins/org.eclipse.emf.compare.doc/src/images/merge_all_to_left.gif [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/merge_all_to_right.gif [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/merge_to_left.gif [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/merge_to_right.gif [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/images/reject_all_changes.gif [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.doc/src/user/user-guide.mediawiki diff | blob | blame | history
Eclipse foundation framework to comapre EMF models