diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:35:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:35:49 +0100 |
| commit | 23ec56516e02796fe22c5c84d59a309d90234908 (patch) | |
| tree | 429e1ffc59cd926dbd4f688270be5bf9daa8629c /src/plugins/glsleditor | |
| parent | adf70c1a84a92a4913b75c2347161317d093260d (diff) | |
| parent | b201c9be2b35256fd927ed16208479286093fdef (diff) | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
src/plugins/coreplugin/coreplugin.cpp
Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
Diffstat (limited to 'src/plugins/glsleditor')
0 files changed, 0 insertions, 0 deletions