branch | RCL_3 |
changeset 7 | 3f74d0d4af4c |
parent 3 | 41300fa6a67c |
6:dee5afe5301f | 7:3f74d0d4af4c |
---|---|
1 2010-02-18 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> |
|
2 |
|
3 Reviewed by Eric Seidel. |
|
4 |
|
5 Add .gitattributes file for custom ChangeLog merge-driver |
|
6 |
|
7 * .gitattributes: Added. |
|
8 |
|
1 2009-11-30 Jan-Arve Sæther <jan-arve.saether@nokia.com> |
9 2009-11-30 Jan-Arve Sæther <jan-arve.saether@nokia.com> |
2 |
10 |
3 Reviewed by Simon Hausmann. |
11 Reviewed by Simon Hausmann. |
4 |
12 |
5 [Qt] Fix compilation with win32-icc |
13 [Qt] Fix compilation with win32-icc |