projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b34801d 9e3ec7a)
Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 09:31:55 +0000 (12:31 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 09:31:55 +0000 (12:31 +0300)
Conflicts:
src/engine/engine.cpp

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.