]> git.ipfire.org Git - thirdparty/tvheadend.git/commit
Merge remote-tracking branch 'upstream/master' after all FreeBSD
authorBernhard Froehlich <decke@bluelife.at>
Sun, 2 Jun 2013 09:30:50 +0000 (11:30 +0200)
committerBernhard Froehlich <decke@bluelife.at>
Sun, 2 Jun 2013 09:30:50 +0000 (11:30 +0200)
commit7082d8da7777c08cbafb8bfb263b86ab31b2cf02
tree16b6b88edc81740a67c2fe7fc69c5ac506972e74
parentcf2963e56617dfad262c5bb41116e2a1f4898b2a
parent17b16d7a76243ac07f980c0222abe2edd1e5699e
Merge remote-tracking branch 'upstream/master' after all FreeBSD
related changes have been merged from upstream.
src/dvb/dvb_adapter.c
src/timeshift/timeshift_reader.c