| commit | 987b9a22be41b1ff80a029326babf256b66375e7 | [log] [tgz] |
|---|---|---|
| author | Kevin KIN-FOO <kkinfoo@sierrawireless.com> | Wed Jan 21 19:23:53 2015 +0100 |
| committer | Kevin KIN-FOO <kkinfoo@sierrawireless.com> | Wed Jan 21 19:23:53 2015 +0100 |
| tree | fb1ea67530c6197924c41155f4e38e3dbd2a0ba2 | |
| parent | d645240e6244d712c5bd497757df2971f2da6550 [diff] | |
| parent | 33166cb0199664afb5f284655520195313ff1197 [diff] |
Merge branch 'lua52' Conflicts: plugins/org.eclipse.ldt.ui/OSGI-INF/l10n/bundle.properties plugins/org.eclipse.ldt.ui/src/org/eclipse/ldt/ui/wizards/LuaProjectCreator.java plugins/org.eclipse.ldt/META-INF/MANIFEST.MF