ToastFreeware / debian / bti.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ed409e e4a7b3e)
Merge tag 'upstream/033'
authorgregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
Upstream version 033

Conflicts:
bti.1

1  2 
bti.xml patch | diff1 | diff2 | blob | history

diff --cc bti.xml
Simple merge
Debian package bti