]> git.etc.gen.nz Git - mythtv-status.git/commit
Merge commit 'origin/master' into packaging debian-etch-0.9.0-1
authorAndrew Ruthven <andrew@etc.gen.nz>
Sun, 27 Jul 2008 09:28:37 +0000 (21:28 +1200)
committerAndrew Ruthven <andrew@cerberus.etc.gen.nz>
Sun, 27 Jul 2008 09:28:37 +0000 (21:28 +1200)
commita81a062cec8215dff751c7fee7a69d6e1b663e82
tree931629c4efa839b31694d62e6338d84ad906a949
parent4b5cb43cb9c31396594cf1ba5c37f9b0aef9076a
parentb696a747f6d4362e1f43e7ea347d42027590eea1
Merge commit 'origin/master' into packaging

Conflicts:

Makefile
Makefile
debian/control