niels 8d2ce16227 Merge branch 'master' of code.dyne.org:veejay ...

Conflicts:
	veejay-current/veejay-client/configure.ac
	veejay-current/veejay-server/configure.ac
	veejay-current/veejay-server/libel/vj-avcodec.c
	veejay-current/veejay-server/libel/vj-el.c
	veejay-current/veejay-server/libstream/v4l2utils.c
	veejay-current/veejay-server/libvje/effects/chameleon.c

2014-11-22 20:59:53 +01:00

54 KiB

Raw Blame History

View Raw