]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52b1099 5a8b5e7)
Merge branch 'osx' of git://github.com/dmarion/tvheadend into master
authorJaroslav Kysela <perex@perex.cz>
Mon, 26 May 2014 19:58:04 +0000 (21:58 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 26 May 2014 19:58:23 +0000 (21:58 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Mirror of https://github.com/tvheadend/tvheadend.git