author | Eckhart Koeppen <eckhart.koppen@nokia.com> |
Fri, 16 Apr 2010 11:39:52 +0300 | |
branch | RCL_3 |
changeset 8 | 740e5562c97f |
parent 7 | 3f74d0d4af4c |
child 9 | b5b118452c7d |
permissions | -rw-r--r-- |
0 | 1 |
This is a snapshot of the Qt port of WebKit from |
2 |
||
3 |
git://gitorious.org/qtwebkit/qtwebkit.git |
|
4 |
||
5 |
The commit imported was from the |
|
6 |
||
3
41300fa6a67c
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
0
diff
changeset
|
7 |
qtwebkit/qtwebkit-4.6 branch/tag |
0 | 8 |
|
9 |
and has the sha1 checksum |
|
10 |
||
8
740e5562c97f
8b5beb2a553102639e9eb38c8f8f0f6775e8545b
Eckhart Koeppen <eckhart.koppen@nokia.com>
parents:
7
diff
changeset
|
11 |
<<<<<<< HEAD |
7
3f74d0d4af4c
qt:70947f0f93d948bc89b3b43d00da758a51f1ef84
Eckhart Koeppen <eckhart.koppen@nokia.com>
parents:
5
diff
changeset
|
12 |
e9151b11e974f0aa47fd40c225f88f35ced91496 |
8
740e5562c97f
8b5beb2a553102639e9eb38c8f8f0f6775e8545b
Eckhart Koeppen <eckhart.koppen@nokia.com>
parents:
7
diff
changeset
|
13 |
======= |
740e5562c97f
8b5beb2a553102639e9eb38c8f8f0f6775e8545b
Eckhart Koeppen <eckhart.koppen@nokia.com>
parents:
7
diff
changeset
|
14 |
14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 |
740e5562c97f
8b5beb2a553102639e9eb38c8f8f0f6775e8545b
Eckhart Koeppen <eckhart.koppen@nokia.com>
parents:
7
diff
changeset
|
15 |
>>>>>>> 8f75ee7... Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 ) |