diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 16:34:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 16:34:46 (GMT) |
| commit | 6fad80a8da2c2714be51fc2bcae95f3a335916ca (patch) | |
| tree | baf396bcae0a7eced750dbb7fa2e7cca700658f3 /src/3rdparty/webkit/.gitattributes | |
| parent | fa2a64ee5ec1d9e65cb0c4b984c27b56fdae0120 (diff) | |
| parent | 903d7a43a5d936bb1e853e5add7c4c3c5503737e (diff) | |
| download | Qt-6fad80a8da2c2714be51fc2bcae95f3a335916ca.zip Qt-6fad80a8da2c2714be51fc2bcae95f3a335916ca.tar.gz Qt-6fad80a8da2c2714be51fc2bcae95f3a335916ca.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Diffstat (limited to 'src/3rdparty/webkit/.gitattributes')
| -rw-r--r-- | src/3rdparty/webkit/.gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/.gitattributes b/src/3rdparty/webkit/.gitattributes new file mode 100644 index 0000000..5b43bd0 --- /dev/null +++ b/src/3rdparty/webkit/.gitattributes @@ -0,0 +1,4 @@ +# To enable automatic merging of ChangeLog files, use the following command: +# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B" +ChangeLog* merge=changelog + |