diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-07-13 15:20:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-07-13 15:20:54 +0200 |
| commit | adf2c1b0dacf0f89954cabe25d7d0524144d31a2 (patch) | |
| tree | 4ea386dae754b9cd4a204339f41a1ee2ff35bad8 /src/plugins/debugger/debuggerplugin.h | |
| parent | 3ed60eaa6caa69d73392966c906cdf407bcc3d82 (diff) | |
| parent | a9cf11c57fcc05fc071636b4f4d6b14e157657f8 (diff) | |
| download | qt-creator-adf2c1b0dacf0f89954cabe25d7d0524144d31a2.tar.gz | |
Merge branch '2.0'
Conflicts:
src/plugins/qmlinspector/QmlInspector.pluginspec
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.h')
0 files changed, 0 insertions, 0 deletions