Fixed line endings.
authorDavid Boddie <david.boddie@nokia.com>
Thu, 28 Apr 2011 17:04:16 +0000 (19:04 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 15:08:20 +0000 (17:08 +0200)
commit4d10065c54f9b277f44ed042f4e18858dafdd1df
treed06de356345106b54cdd3517e90084f7baeda2d7
parentf9f395c28b8ce66c0605607ea76ad1099d45a6c9
Fixed line endings.

Conflicts:

examples/widgets/applicationicon/applicationicon.svg
examples/widgets/applicationicon/main.cpp
examples/widgets/elidedlabel/elidedlabel.cpp
examples/widgets/elidedlabel/elidedlabel.h
examples/widgets/elidedlabel/main.cpp
examples/widgets/elidedlabel/testwidget.cpp
examples/widgets/elidedlabel/testwidget.h
(cherry picked from commit 1b555a91f05b68c697b6985d1b672dc0fba5fc5a)
(cherry picked from commit c0e0bfdd451f42b10051e8064153b811080ffa0e)
examples/widgets/applicationicon/applicationicon.svg [new file with mode: 0644]
examples/widgets/applicationicon/main.cpp [new file with mode: 0644]
examples/widgets/elidedlabel/elidedlabel.cpp [new file with mode: 0644]
examples/widgets/elidedlabel/elidedlabel.h [new file with mode: 0644]
examples/widgets/elidedlabel/main.cpp [new file with mode: 0644]
examples/widgets/elidedlabel/testwidget.cpp [new file with mode: 0644]
examples/widgets/elidedlabel/testwidget.h [new file with mode: 0644]