Merge branch 'master' into extensions
authorNikhil Marathe <nsm.nikhil@gmail.com>
Fri, 29 Oct 2010 06:49:13 +0000 (12:19 +0530)
committerNikhil Marathe <nsm.nikhil@gmail.com>
Fri, 29 Oct 2010 06:49:13 +0000 (12:19 +0530)
commitcbd7e32a1ffb49b5d95cb5b3d391a4346c14b3f1
tree8f714b246e1026f275ba318bd637c29abf453b83
parentaa514305c4db6444f721cbaf19997aa43312805c
parenta03983078b912be099e5905bf28b4fd303e98341
Merge branch 'master' into extensions

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