Merged with ui. Added .orig files to .gitignore.
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 30 Mar 2010 13:43:21 +0000 (16:43 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 30 Mar 2010 13:43:21 +0000 (16:43 +0300)
commitf931daeb6f80ca2bf65b191566ad3d411cc8c917
treef7f38e0f8400180d4be78371db50d026ff7dce4d
parent68e2d218d969a5b80b7befa20b99816b4f31889e
parenteb7e435d07e68ca495d542e58523027be8e859fb
Merged with ui. Added .orig files to .gitignore.

Conflicts:
.gitignore
Situare.pro
src/ui/mainwindow.cpp
12 files changed:
.gitignore
Situare.pro
res/images/test_map_tiles/14_9351_4261.png
res/images/test_map_tiles/14_9351_4262.png
res/images/test_map_tiles/14_9351_4263.png
res/images/test_map_tiles/14_9351_4264.png
res/images/test_map_tiles/14_9354_4261.png
res/images/test_map_tiles/14_9354_4262.png
res/images/test_map_tiles/14_9354_4263.png
res/images/test_map_tiles/14_9354_4264.png
res/images/test_map_tiles/empty.png
src/ui/mapviewtab.cpp