Merge branch 'master' into extensions extensions
authorNikhil Marathe <nsm.nikhil@gmail.com>
Sun, 14 Nov 2010 05:40:16 +0000 (11:10 +0530)
committerNikhil Marathe <nsm.nikhil@gmail.com>
Sun, 14 Nov 2010 05:40:16 +0000 (11:10 +0530)
commit7c191b258ccff3c3c004bb0b5ccdd3050e8f4079
treef7ee04927496b5d80f1e79072b257f7593b82957
parentc928dd6c2ccebbf3ba774e3be6fbb67319abc888
parenta09bc80079b07a3b02f23e88bddda77e2c85a1f7
Merge branch 'master' into extensions

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