diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-23 14:25:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-23 14:25:38 +0100 |
| commit | 3f63635053a7870289dfe498c636efe67d988900 (patch) | |
| tree | 723c4f258ad825314582c6b3bfdee0844d1acae5 /src/plugins/mercurial/constants.h | |
| parent | 22e3a7b3a4651a487f0e408a8aa255706337a689 (diff) | |
| parent | 499589096a54181bfdbfad5bc2ba50dc945d0934 (diff) | |
| download | qt-creator-3f63635053a7870289dfe498c636efe67d988900.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
src/plugins/git/gitplugin.cpp
Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
Diffstat (limited to 'src/plugins/mercurial/constants.h')
0 files changed, 0 insertions, 0 deletions