FIxing conflicts
authorAndrea Diamantini <adjam7@gmail.com>
Wed, 18 Nov 2009 10:27:03 +0000 (11:27 +0100)
committerAndrea Diamantini <adjam7@gmail.com>
Wed, 18 Nov 2009 10:27:03 +0000 (11:27 +0100)
commita8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7
tree0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc
parent7a55537201493fefdf076108e30b6be45c345719
parentc50290e8fdbce0e7736a717cf44c8ab8b062fe77
FIxing conflicts

Merge branch 'rekonq04' into dev04try

Conflicts:
src/CMakeLists.txt
CMakeLists.txt
src/CMakeLists.txt
src/application.cpp
src/mainwindow.cpp
src/mainwindow.h