projects / situare / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 353eef8 0ca1724)
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 14:08:42 +0000 (17:08 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 14:08:42 +0000 (17:08 +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.