Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 1 Apr 2010 04:39:02 +0000 (07:39 +0300)
committerJukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Thu, 1 Apr 2010 04:39:02 +0000 (07:39 +0300)
commit465a945bf4961129ef0428d5c678ae1b9af7540e
treefa9867744f5510cedaab365c9a2fa8849222581a
parent10b02ed0a74d51e1c279af13e96bff6f019620da
parent489b5fa58ff448e50a50e55a5d583243c4c2abbe
Merge branch 'master' of https://vcs.maemo.org/git/situare
Updates from debianizing.
Conflicts:
Situare.pro
tests/testUI/testUI/testui.cpp