diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-30 07:30:09 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-30 07:30:09 (GMT) |
| commit | 1e6fdf225797f03990b4511cdf3655905ece2cf9 (patch) | |
| tree | 57ae414f6aa4c6dc2089a478dd15c93df6982ce9 /util | |
| parent | 26a55136f393eed1689f3671e65187ce1523bf09 (diff) | |
| parent | a8ea6dc6357049847eab361328a611b42f681c2a (diff) | |
| download | Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.zip Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.tar.gz Qt-1e6fdf225797f03990b4511cdf3655905ece2cf9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
src/script/qscriptbuffer_p.h
src/script/qscriptclassinfo_p.h
src/script/qscriptecmadate.cpp
src/script/qscriptgc_p.h
src/script/qscriptmemberfwd_p.h
src/script/qscriptsyntaxcheckresult_p.h
src/script/qscriptvalueimplfwd_p.h
tests/auto/qscriptengine/tst_qscriptengine.cpp
util/webkit/mkdist-webkit
Diffstat (limited to 'util')
| -rwxr-xr-x | util/webkit/mkdist-webkit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 72ce8e8..c601f76 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -5,7 +5,7 @@ die() { exit 1 } -default_tag="origin/qtwebkit-4.6-staging" +default_tag="qtwebkit-4.6-snapshot-29072009" if [ $# -eq 0 ]; then tag="$default_tag" |