diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-07 12:26:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-07 12:26:59 +0200 |
| commit | 1f3896e8af6f4417588b65f0fa68759277ab6dac (patch) | |
| tree | c50d91f341daaf6e2bee4eab606344ce1c73f68d /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | fdb0876e9c0e56f721f7bae1cc5eeb220f03c165 (diff) | |
| parent | 600127e8758122501cd4f14b394bfc8e5f95872b (diff) | |
| download | qt-creator-1f3896e8af6f4417588b65f0fa68759277ab6dac.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
share/qtcreator/dumper/bridge.py
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
0 files changed, 0 insertions, 0 deletions