• Jean-Paul Saman's avatar
    Merge branch 'master' of git://git.videolan.org/dvblast into for-videolan · ff211f10
    Jean-Paul Saman authored
    The following conflicts occured because this tree originates from SVN directly, while the
    tree which was merged was converted to git by others.
    
    Conflicts:
    	AUTHORS
    	INSTALL
    	Makefile
    	NEWS
    	README
    	TODO
    	asi.c
    	comm.c
    	comm.h
    	demux.c
    	dvb.c
    	dvblast.1
    	dvblast.c
    	dvblast.h
    	dvblast_mmi.sh
    	dvblastctl.c
    	en50221.c
    	en50221.h
    	output.c
    	udp.c
    	util.c
    	version.h
    ff211f10
INSTALL 531 Bytes