]> git.etc.gen.nz Git - mythtv-status.git/commitdiff
projects / mythtv-status.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c9006a 6f158d2)
Merge branch 'debian-release-0.8' into packaging
authorAndrew Ruthven <andrew@etc.gen.nz>
Mon, 30 Jun 2008 03:13:25 +0000 (15:13 +1200)
committerAndrew Ruthven <andrew@cerberus.etc.gen.nz>
Mon, 30 Jun 2008 03:13:25 +0000 (15:13 +1200)
Conflicts:

Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
MythTV Status from the command line.