hrs 2011-01-04 11:56:56 UTC FreeBSD ports repository Modified files: multimedia/flvstreamer Makefile Log: Remove conflicted files with rtmpdump and a CONFLICTS line. The flvstreamer can coexist with rtmpdump now. Pointed out by: Jan Henrik Sylvester Revision Changes Path 1.2 +2 -2 ports/multimedia/flvstreamer/Makefile