projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a8b5b 782cda8)
Merge branch 'master' of pini-deb-guest@alioth.debian.org:/git/collab-maint/navit
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:05:23 +0000 (16:05 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:05:23 +0000 (16:05 +0200)
Conflicts:
debian/changelog

1  2 
debian/control patch | diff1 | diff2 | blob | history

diff --cc debian/control
Simple merge
Unnamed repository; edit this file to name it for gitweb.