Merge pull request #3735 from xhaggi/confluence-epg-timeline
authorMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 1 Dec 2013 13:17:32 +0000 (05:17 -0800)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 1 Dec 2013 13:17:32 +0000 (05:17 -0800)
[confluence] texture changes for epg timeline view


Trivial merge