diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-09-02 01:27:53 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-09-02 01:27:53 (GMT) |
| commit | 7e5ce60d93b3f9151df01f1917bc870ed6154fa8 (patch) | |
| tree | ad73249cd6003916dec56059875fa4366d49f0e8 /abs/core/linhes-scripts | |
| parent | 2095e9f3f7795b97a31ef521609e3fc7f7b536a4 (diff) | |
| download | linhes_pkgbuild-7e5ce60d93b3f9151df01f1917bc870ed6154fa8.zip linhes_pkgbuild-7e5ce60d93b3f9151df01f1917bc870ed6154fa8.tar.gz linhes_pkgbuild-7e5ce60d93b3f9151df01f1917bc870ed6154fa8.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen (5) and others
# Via Britney Fransen
* origin/testing:
LinHES-system: Add scripts for misc status in MythWeb. closes #845.
linhes-scripts: tweak myth2mkv. Update version to 0.25-004
dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844
v4l-dvb: update to snapshot from 20120828. refs #844
LinHES-system: update myth_status.py to work with tuners in error. closes #843
curlftpfs: Initial Inclusion.
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/LinHES-system/PKGBUILD
abs/core/linhes-scripts/PKGBUILD
abs/core/linhes-scripts/myth2mkv
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core/linhes-scripts')
| -rw-r--r-- | abs/core/linhes-scripts/myth2mkv | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv index 447e3c4..aedccff 100644 --- a/abs/core/linhes-scripts/myth2mkv +++ b/abs/core/linhes-scripts/myth2mkv @@ -2,7 +2,7 @@ # # Convert video to AVC-1 / h264 # -# version 0.25-003 +# version 0.25-004 # # Prerequisites: # - mythtv >= 0.25 |