| commit | 9c357de42d5444f5a5953fbf0f5d3385608c149d | [log] [tgz] |
|---|---|---|
| author | Florian Thienel <florian@thienel.org> | Tue Nov 24 18:22:46 2015 +0100 |
| committer | Florian Thienel <florian@thienel.org> | Tue Nov 24 18:22:46 2015 +0100 |
| tree | 9f06fd56648fa211ad91e24bf7843a299a9d3460 | |
| parent | aa45f04e892fa5356f1a869610af831065d868dd [diff] | |
| parent | 2be6265284f30820ae8a8f0e1d11832d53841df3 [diff] |
Merge branch 'master' into feature/newBoxModel Conflicts: org.eclipse.vex.core.tests/META-INF/MANIFEST.MF org.eclipse.vex.releng/Vex.launch Change-Id: Iacb2f72ef27b0e7832197a44552b3501bd2957fe