Dolda2000 GitWeb / doldaconnect.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec3c210 2d3c1d3)
Merge branch 'dpkg' of pc18:/srv/git/r/doldaconnect into dpkg dpkg
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 18:08:40 +0000 (19:08 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 14 Feb 2008 18:08:40 +0000 (19:08 +0100)
Conflicts:

debian/changelog
debian/control
debian/rules

nothing to commit (working directory clean)


Trivial merge
Dolda Connect