diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-29 15:52:36 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-29 15:52:36 +0100 |
| commit | f1cec4629e3a4d020b5372172d7adbdad6345898 (patch) | |
| tree | 3f1d555be02a84cb8d28feb578d7382bf82933ac /src/plugins/cpaster | |
| parent | 9d29b251e7abbf6184c4c5c17c3350d31454dc98 (diff) | |
| parent | 6d8d85b11638d5931781b707ae44eccf9d0552b5 (diff) | |
| download | qt-creator-f1cec4629e3a4d020b5372172d7adbdad6345898.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/libs/utils/tooltip/tips.cpp
src/plugins/coreplugin/versiondialog.cpp
src/plugins/projectexplorer/kitinformationconfigwidget.cpp
src/plugins/qnx/blackberryapplicationrunner.cpp
src/plugins/qnx/blackberrydeployconfiguration.cpp
src/plugins/qnx/blackberrydeployconfiguration.h
src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
Diffstat (limited to 'src/plugins/cpaster')
| -rw-r--r-- | src/plugins/cpaster/pastebindotcomprotocol.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index f38af7f4fb..ff5173772e 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -82,6 +82,7 @@ static inline QByteArray format(Protocol::ContentType ct) break; case Protocol::Cpp: format += "cpp-qt"; + break; case Protocol::JavaScript: format += "javascript"; break; |