diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-16 16:54:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-16 16:54:50 +0200 |
| commit | 6d1cc5869786509398e8a78ade97637ea8458208 (patch) | |
| tree | 08f25170685a5889628f02933426fdcbdf632f81 /dist | |
| parent | d46a73eacf76712d76d13ffd00423325dc8d9237 (diff) | |
| parent | 1398480f3ab050a8d2076f3712049bd9fd8a2358 (diff) | |
| download | qt-creator-6d1cc5869786509398e8a78ade97637ea8458208.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/plugins/clangcodemodel/test/clangcompletion_test.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
src/plugins/projectexplorer/projectexplorer.pro
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
src/plugins/vcsbase/vcsplugin.cpp
src/shared/qbs
Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/gdb/Makefile.linux | 2 | ||||
| -rw-r--r-- | dist/gdb/Makefile.mingw | 2 | ||||
| -rw-r--r-- | dist/gdb/Makefile.osx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux index 7be684275c..ec4842a94d 100644 --- a/dist/gdb/Makefile.linux +++ b/dist/gdb/Makefile.linux @@ -5,7 +5,7 @@ staging=${broot}/staging pyversion=2.7 expatversion=2.1.0 arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z` -version=7.7 +version=7.7.1 targetdir=${broot}/qtcreator-gdb-${version} gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets}) packagename=qtcreator-gdb-${version}-${arch}.tar.gz diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw index d24ce59a41..7e563dc039 100644 --- a/dist/gdb/Makefile.mingw +++ b/dist/gdb/Makefile.mingw @@ -6,7 +6,7 @@ pyversion=2.7 pydir=${broot}/python expatversion=2.1.0 iconvversion=1.14 -version=7.7 +version=7.7.1 targetdir=${broot}/qtcreator-gdb-${version} gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets}) packageparts=${targetdir}/lib ${targetdir}/data-directory ${targetdir}/libiconv-2.dll ${targetdir}/python27.dll ${targetdir}/libexpat-1.dll diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx index 1d07c0bfc6..6f25707917 100644 --- a/dist/gdb/Makefile.osx +++ b/dist/gdb/Makefile.osx @@ -5,7 +5,7 @@ staging=${broot}/staging pyversion=2.7 expatversion=2.1.0 arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z` -version=7.7 +version=7.7.1 targetdir=${broot}/qtcreator-gdb-${version} gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets}) packagename=qtcreator-gdb-${version}-${arch}.tar.gz |