diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-11-06 14:02:08 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-11-06 14:02:08 +0100 |
commit | 49b7e95e7f4a565788408e23abeae072092e5f73 (patch) | |
tree | 0073b6c9b9a3c79253ce13e16e91bf87805e9fb3 /src/plugins/git/gitclient.cpp | |
parent | f85c2002441ebb1194703f4abc26e368e8f9e811 (diff) | |
parent | fbd3f735941c851ab72df9282f3c5e8fa9eaa775 (diff) | |
download | qt-creator-49b7e95e7f4a565788408e23abeae072092e5f73.tar.gz |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
0 files changed, 0 insertions, 0 deletions