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)
commitd322db622cdac3f4c72eb45c2f5128a088eee330
treeec74cbd62e05ddbd2bf7a482dbaa47675b1a2dcc
parent341418677bf9361b6a2c6065d5a59fcf01996e2f
parent2447aca1fea4f5102be8db0b1701e1882b172ae1
Merge branch 'image_fetcher' into engine

Conflicts:
src/engine/engine.cpp
src/engine/engine.h