diff options
author | James Meyer <james.meyer@operamail.com> | 2012-08-21 23:23:23 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-08-21 23:23:23 (GMT) |
commit | a8c427b35b9b33fcd176141522732541634ebfd0 (patch) | |
tree | 41393fa821ff2049e11d4aa13952ae6ac7c938f6 /abs/extra/conky | |
parent | 3ce90eb147c39ab18d6360742738225811457392 (diff) | |
download | linhes_pkgbuild-a8c427b35b9b33fcd176141522732541634ebfd0.zip linhes_pkgbuild-a8c427b35b9b33fcd176141522732541634ebfd0.tar.gz linhes_pkgbuild-a8c427b35b9b33fcd176141522732541634ebfd0.tar.bz2 |
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (2) and Michael Hanson (1)
# Via Michael Hanson
* origin/testing:
linhes-scripts: minor changes to myth2mkv
mythtv:Bumped to latest fixes. Added ./configure items to close #842.
LinHES-config:7.4 rdt 9th anniversary release.
Conflicts:
abs/core/LinHES-config/LinHES-release
abs/core/LinHES-config/PKGBUILD
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/extra/conky')
0 files changed, 0 insertions, 0 deletions