Merge branch 'master' into extensions
authorNikhil Marathe <nsm.nikhil@gmail.com>
Tue, 1 Jun 2010 06:29:14 +0000 (11:59 +0530)
committerNikhil Marathe <nsm.nikhil@gmail.com>
Tue, 1 Jun 2010 06:29:14 +0000 (11:59 +0530)
commite77723308f2fd32822f550a8f986778d7fb152f0
tree0f39e6f80570b9b1f7e171980282f0ed934711f7
parent69bfe07b9fbb4c8e0a20d8623341e6c19e6e812e
parent785e6bbba70bae11751ae232ee99b23dabb69819
Merge branch 'master' into extensions

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