| commit | d97119831f61a762f10ebf900a61528515b8ae3f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Bettini <lorenzo.bettini@gmail.com> | Wed Jul 06 13:52:38 2016 +0200 |
| committer | Lorenzo Bettini <lorenzo.bettini@gmail.com> | Wed Jul 06 14:31:03 2016 +0200 |
| tree | 6286be0c4142fe5b663281e70f4f9f1dc0b43a8d | |
| parent | 096a172105f63af0bc8196c13d9e2b87074c8b9a [diff] | |
| parent | 1019415f61ead94eb08ef6b6b7da1c1f237a022c [diff] |
Merge branch 'bugfix' Conflicts: examples/org.eclipse.emf.parsley.examples.mail.unifiedfoldersview/META-INF/MANIFEST.MF Change-Id: I4e9444c038446f30f348d4a3e2f0fd455eab23be