Merge branch 'master' into error_procedur
authorlampehe-local <henri.lampela@ixonos.com>
Thu, 10 Jun 2010 10:43:05 +0000 (13:43 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Thu, 10 Jun 2010 10:43:05 +0000 (13:43 +0300)
commit525f3169e453fb9ae2dcbb283d1756e3c20b6614
tree10d8407b29368db84dfb7a999b41d5cdfc07a89a
parent7833964f96e1c9315f6fadd44c189f98f7201041
parentdfb4e469b0adad3aa4f271ec3f571ed3db30ae86
Merge branch 'master' into error_procedur

Conflicts:
src/engine/engine.cpp
src/gps/gpsposition.h
src/situareservice/situareservice.cpp
src/engine/engine.cpp