| commit | b83c05e6c12a79c930762831facda2b0aca9c174 | [log] [tgz] |
|---|---|---|
| author | Stephan Herrmann <stephan.herrmann@berlin.de> | Sun Dec 29 19:35:32 2013 +0100 |
| committer | Stephan Herrmann <stephan.herrmann@berlin.de> | Sun Dec 29 19:35:32 2013 +0100 |
| tree | 3ee102590f671eb02de6953090c7419094a96bea | |
| parent | aaa73af782129e021cfc500f5e260ed9ec03782b [diff] | |
| parent | 9b5f216eb1069dc8f5211bf81bf5e2fb46bebbe1 [diff] |
Merge commit '9b5f216eb1069dc8f5211bf81bf5e2fb46bebbe1' into OT_BETA_JAVA8 Conflicts: plugins/org.eclipse.objectteams.otdt.jdt.ui/META-INF/MANIFEST.MF releng/build-scripts/build/otdt_prerequisites.sh releng/map/otdt.map.in