| commit | 716b1893478778594f7185df366079f457170eba | [log] [tgz] |
|---|---|---|
| author | Karsten Thoms <karsten.thoms@itemis.de> | Thu Dec 12 11:10:51 2013 +0100 |
| committer | Karsten Thoms <karsten.thoms@itemis.de> | Thu Dec 12 11:10:51 2013 +0100 |
| tree | a0868b7bee5c100da186afd34936d105363cb003 | |
| parent | 85d345fcec07c6ddbe51930e8cd5f27ead5f8bfa [diff] | |
| parent | 94f1ce072e2107fa51b7a89abd96bdbfb99c3133 [diff] |
Merge remote-tracking branch 'eclipse/xpand2_master' into xpand2_master Conflicts: plugins/org.eclipse.xpand/src/org/eclipse/internal/xpand2/codeassist/KeywordProposalComputer.java