xbmc/xbmc — pull request #1577 by Glenn-1990 (2012-10-09 00:54:16+00:00)
Title: [PVR] timer conflict support

This PR adds the possibility to show wich timers are in conflict and therefore won't be able to record.

I have not tested this very well yet as I'm only at home in the weekend, but want to get this in before feature freeze.