Merge branch 'master' into cookies_refactored
authorlampehe-local <henri.lampela@ixonos.com>
Wed, 26 May 2010 10:53:15 +0000 (13:53 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Wed, 26 May 2010 10:53:15 +0000 (13:53 +0300)
commit7aabba7abedae721d336c69defb22593dc7d5512
tree4725b33edcc0521f089d180e5fbe871f91439634
parent9ae89c6828a209a810f9e192b96efab9d26caa3b
parent7745f2095ede6559dca5ef16645e9255af48ec91
Merge branch 'master' into cookies_refactored

Conflicts:
src/common.h
src/src.pro
src/common.h
src/src.pro
src/ui/mainwindow.cpp