projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39697a3 3c48617)
Merge branch 'master' into indicator
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 26 Jul 2010 08:50:16 +0000 (11:50 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 26 Jul 2010 08:50:16 +0000 (11:50 +0300)
1  2 
src/engine/engine.cpp patch | diff1 | diff2 | blob | history

diff --cc src/engine/engine.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.