| changeset 19 | fcece45ef507 |
| parent 3 | 41300fa6a67c |
| child 30 | 5dc02b23752f |
| 18:2f34d5167611 | 19:fcece45ef507 |
|---|---|
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 |