jp9000 d328d72f0b Merge branch 'master' of https://github.com/jp9000/obs-studio ...

Conflicts:
	test/osx/test.mm

2014-04-14 14:17:52 -07:00

..

osx

Update test programs and filters

2014-04-14 14:10:47 -07:00

test-input

Properly bridge CF object so ARC can deal with it

2014-04-14 23:02:53 +02:00

win

Update test programs and filters

2014-04-14 14:10:47 -07:00

CMakeLists.txt

Full rewrite of all CMakeLists

2014-01-24 18:56:32 +01:00