commit | 25fde45b5902a8d52bc0f4ad08a11da1fc914fb2 | [log] [tgz] |
---|---|---|
author | Michael Jastram <michael@jastram.de> | Mon Nov 10 13:15:29 2014 +0100 |
committer | Michael Jastram <michael@jastram.de> | Mon Nov 10 13:15:29 2014 +0100 |
tree | 622f50d9f6e2226a255bfe10650fe0192a4e4770 | |
parent | e417cb853a4ffa6f735f5680e5abfbd4a7b0a7a2 [diff] | |
parent | 097589944ebb3f34dbfc8ecbc3290958f1b90dd0 [diff] |
Merge commit 'refs/changes/18/36218/1' of ssh://git.eclipse.org:29418/rmf/org.eclipse.rmf into develop Conflicts: org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/presentation/Reqif10Editor.java