diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:00:55 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:00:55 (GMT) |
| commit | 32b5fdfabf3158c7b03d1011f4551a45371b27e3 (patch) | |
| tree | 0339732e5529917a52eb7ff86e6209c262ab7032 /src/3rdparty/webkit/.gitattributes | |
| parent | d373f8b8ee0a5841bcdb264b0b01b262c15e7f89 (diff) | |
| parent | a4f0b174dd7d6eb837915d9d99b2067b8cb00187 (diff) | |
| download | Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.zip Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.gz Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
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 + |