projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3414186 2447aca)
Merge branch 'image_fetcher' into engine
authorKaj Wallin <kaj.wallin@ixonos.com>
Wed, 28 Apr 2010 08:11:22 +0000 (11:11 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Wed, 28 Apr 2010 08:11:22 +0000 (11:11 +0300)
Conflicts:
src/engine/engine.cpp
src/engine/engine.h


Trivial merge
Unnamed repository; edit this file to name it for gitweb.