git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea7b9cc 266b7db)
Merge branch 'bug_124_m2ts_support' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 21 Dec 2010 10:47:08 +0000 (11:47 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 21 Dec 2010 10:47:08 +0000 (11:47 +0100)
1  2 
lib/dvb/pmt.cpp patch | diff1 | diff2 | blob | history
lib/dvb/pmt.h patch | diff1 | diff2 | blob | history

diff --cc lib/dvb/pmt.cpp
Simple merge
diff --cc lib/dvb/pmt.h
Simple merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources