diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-09-23 19:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-09-23 19:14:54 (GMT) |
| commit | c96cd6fab2342335a4f64b7eb2c843cd576eb610 (patch) | |
| tree | 551793d94c47f1e4d88ed5309d5224435762bf1e /abs/extra/usbmuxd/usbmuxd.install | |
| parent | 048e83695f2b4cb9ddc118e128a7d08f7d48e651 (diff) | |
| parent | cafd1e5f46d61c3175d4a3347c65ae79c476c61a (diff) | |
| download | linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.zip linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.tar.gz linhes_pkgbuild-c96cd6fab2342335a4f64b7eb2c843cd576eb610.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (6) and Britney Fransen (2)
# Via Britney Fransen (1) and Cecil (1)
* origin/testing:
LinHES-system: myth_status.py: fix conflicted recordings
mythtv: bump to latest fixes to get python bindings fix
pyxis:Initial inclusion. Needed for pyxis to close #63/4).
python-distribute:Needed for python-beautifulsoup (to close #63/4).
python-beautifulsoup4:Needed for pyxis (to close #63/4).
python-libconcord:Moved to core with rest of python modules.
gdb:Recompile against Python 2.6. Closes 850.
mythappletrailers:Closes 849. Adds Play All, Shuffle and Play Random trailer to the menu.
Conflicts were set to 64 bit versions, except for appletrailers
Conflicts:
abs/core/LinHES-system/PKGBUILD
abs/core/gdb/PKGBUILD
abs/core/gdb/__changelog
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
abs/core/python_modules/python-distribute/PKGBUILD
abs/core/python_modules/python-distribute/__changelog
abs/extra/mythappletrailers/PKGBUILD
Diffstat (limited to 'abs/extra/usbmuxd/usbmuxd.install')
0 files changed, 0 insertions, 0 deletions