Marko Viitanen a16efe6b52 Merge remote-tracking branch 'remotes/github_kvazaar/master' ... # Conflicts: # build/kvazaar_VS2013.sln # build/kvazaar_VS2015.sln # build/kvazaar_VS2017.sln # build/kvazaar_cli/kvazaar_cli.vcxproj # build/kvazaar_lib/kvazaar_lib.vcxproj # build/kvazaar_tests/kvazaar_tests.vcxproj # src/encode_coding_tree.c # src/encode_coding_tree.h # src/encoder_state-bitstream.c # src/inter.c # src/strategies/avx2/quant-avx2.c		2019-08-22 15:12:01 +03:00
..
kvazaar_lib.vcxproj	Merge remote-tracking branch 'remotes/github_kvazaar/master'	2019-08-22 15:12:01 +03:00
kvazaar_lib.vcxproj.filters	Merge remote-tracking branch 'remotes/github_kvazaar/master'	2019-08-22 15:12:01 +03:00