]> git.etc.gen.nz Git - mythtv-status.git/commit
Merge commit 'origin/release-0.5'
authorAndrew Ruthven <puck@catalyst.net.nz>
Thu, 29 Nov 2007 21:53:48 +0000 (10:53 +1300)
committerAndrew Ruthven <puck@dirk.wgtn.cat-it.co.nz>
Thu, 29 Nov 2007 21:53:48 +0000 (10:53 +1300)
commit600764534231d4aeb5f2c5872888fc60e5469466
treea85c2460898f08b844a2b403272265638ab58354
parent24d6bd69dc6ec0152aaf21a1e09a930c517b743d
parentadb4becdaf0b8dfbfd751778c5a5a8d335086644
Merge commit 'origin/release-0.5'

Conflicts:

ChangeLog
Makefile
bin/mythtv-status
debian/changelog
ChangeLog
bin/mythtv-status