Permalink
Commits on May 30, 2011
  1. Merge branch 'pullreq127'

    opdenkamp committed May 30, 2011
Commits on May 29, 2011
  1. fixed: pvrclients to work with ios/atv2/osx

    amet committed May 29, 2011
  2. [ATV2] if xcode build

    amet committed May 29, 2011
  3. epg: don't keep the mutex locked in CEpgContainer::RemoveOldEntries()…

    opdenkamp committed May 29, 2011
    … and only clean up the db if it's actually being used
  4. [osx/atv2/ios] xcode project fixes

    amet committed May 29, 2011
Commits on May 28, 2011
  1. Revert a116bf5. Issue #114

    opdenkamp committed May 28, 2011
  2. Merge pull request #126 from FernetMenta/pvr

    Lars Op den Kamp committed May 28, 2011
    Pvr: small fixes
  3. Fixed: [Confluence] New Home Player controls for PVR specific functions

    JezzX committed May 22, 2011
    Changed: [Confluence] slimmed down the PVR now playing, Next recording and Now Recording home info
  4. Merge remote branch 'upstream-ro/master'

    opdenkamp committed May 28, 2011
    Conflicts:
    	addons/skin.confluence/720p/custom_SkinSetting_1111.xml
    	addons/skin.confluence/language/English/strings.xml
    	xbmc/settings/AdvancedSettings.cpp
  5. Merge branch 'pullreq123'

    opdenkamp committed May 28, 2011
  6. Added: [Confluence] Support for Weather Plus Add-on. Needs to be inst…

    JezzX committed May 28, 2011
    …alled separately to show extra info
  7. Merge pull request #157 from jhsrennie/master

    John Rennie committed May 28, 2011
    Disable multimedia keys in Windows
Commits on May 27, 2011
  1. [osx] fully revert 1d0c2f3

    davilla committed May 27, 2011
  2. Change appcommand tags in appcommand.xml to match the multimedia key …

    John Rennie committed May 27, 2011
    …tags in keyboard.xml
  3. Disable multimedia keys in Windows, and add advanced settings option …

    John Rennie committed May 27, 2011
    …to enable them
Commits on May 26, 2011
  1. pvr: clean up 23f1065 a bit

    opdenkamp committed May 26, 2011
  2. pvr: move the pvrplayback.scantime check to DVDPlayer instead of tryi…

    opdenkamp committed May 26, 2011
    …ng to handle it in CPVRClients. always restart the timer if the stream buffers run dry. closes #118
  3. pvr: only set state to CACHESTATE_PVR when the channel was switched, …

    opdenkamp committed May 26, 2011
    …not when showing a preview