projects / ptas / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90527f1 618abe5)
Merge branch 'master' of https://vcs.maemo.org/git/ptas
authorMax Waterman <david.waterman@nokia.com>
Thu, 22 Apr 2010 15:48:33 +0000 (18:48 +0300)
committerMax Waterman <david.waterman@nokia.com>
Thu, 22 Apr 2010 15:48:33 +0000 (18:48 +0300)
Conflicts:
zouba/src/route_p.cpp


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