diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-09 00:10:48 (GMT) | 
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-09 00:10:48 (GMT) | 
| commit | eb79c361fd072b1b5a7529f6694f5050d8373c3f (patch) | |
| tree | ca77d6c7972a868dcb34f738f4b8870d564e02e7 /abs/extra/java7-openjdk/jre7-openjdk.install | |
| parent | 15699db7cc8429c3f9d7a2b516b91889e010984d (diff) | |
| parent | 90514910be147bd0aa416dc29ab4cb0791844cc4 (diff) | |
| download | linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.zip linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.gz linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (8) and Michael Hanson (4)
# Via Cecil (2) and Michael Hanson (1)
* origin/testing:
  mplayer: nothing to see here
  bluez: update to 4.101
  linhes-scripts:Corrected scripting errors in ripD_eject.sh.
  linhes-scripts:Modifed ripD_eject.sh to use HandBrakeCLI.
  mplayer: minor correction to PKGBUILD. No pkg built.
  handbrake:Bumped to 0.9.8. Closes #838.
  mythtv:Bumped to add deps for backing up DVD.
  mythtv:Bumped to compiles latest 0.25.2. Added DVD backup menu.
  mythplugins:Bumped to compiles latest 0.25.2.
  linhes-scripts:Added scripts to backup one's DVD.
  lsdvd:initial inclusion. For use with ripD.
  linhes-scripts: fix for myth2mkv
Conflicts:
	abs/core/mplayer/PKGBUILD
	abs/core/mythtv/stable-0.25/git_src/git_hash
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/extra/java7-openjdk/jre7-openjdk.install')
0 files changed, 0 insertions, 0 deletions
