Merge branch 'master' into cookies_refactored
authorlampehe-local <henri.lampela@ixonos.com>
Fri, 28 May 2010 05:20:20 +0000 (08:20 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Fri, 28 May 2010 05:20:20 +0000 (08:20 +0300)
commit2d8c5447cdd9263ff54dd97689170f94e63213f4
tree0bde7009357aad1ce2c70a7f1296ac39ed218db7
parenteffd139c90a82b801a655e23190d66a7784acc6d
parent472569e2b0143b0f6f8dcc20c0802de6f20b0b1a
Merge branch 'master' into cookies_refactored

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