Change #4462

Comments

Merge branch 'master' into features/python3

Changed files

• BuildMacDeps.sh
• CMakeLists.txt
• mac/MakeDist.sh
• mac/PackDeps.sh
• mac/UnpackDeps.sh
• mac/avg_env.sh
• mac/dc1394_mavericks.patch
• mac/fontconfig-disablecache.patch
• mac/fontconfig.pc.in.patch
• mac/freetype_linespacing.patch
• mac/gcc-fat.sh
• mac/glib.patch
• mac/installscripts/background.tif
• mac/installscripts/postflight
• mac/libavg.10.6.pmdoc/01dist-contents.xml
• mac/libavg.10.6.pmdoc/01dist.xml
• mac/libavg.10.6.pmdoc/02bindist-contents.xml
• mac/libavg.10.6.pmdoc/02bindist.xml
• mac/libavg.10.6.pmdoc/03sharedist-contents.xml
• mac/libavg.10.6.pmdoc/03sharedist.xml
• mac/libavg.10.6.pmdoc/index.xml
• mac/librsvg_configure.patch
• mac/librsvg_makefile.patch
• mac/libsdl_elcapitan.patch
• mac/libsdl_mavericks.patch
• mac/libtool.m4.patch
• mac/pkg-config-mavericks.patch
• mac/readme.txt
• mac/stpncpy.patch
• mac/welcome.txt
• pkg-config/mac/libxml2.pc
• pkg-config/rpi/bcm.pc
• pkg-config/rpi/egl.pc
• pkg-config/rpi/glesv2.pc
• rpi-configure
• rpi-gcc
• src/audio/AudioEngine.cpp
• src/avgconfig.h.cmake.in
• src/avgrc
• src/base/ConfigMgr.cpp
• src/graphics/BCMDisplay.cpp
• src/graphics/BCMDisplay.h
• src/graphics/CMakeLists.txt
• src/graphics/Display.cpp
• src/graphics/EGLContext.cpp
• src/graphics/EGLContext.h
• src/graphics/GLContext.cpp
• src/graphics/GLContextManager.cpp
• src/player/Canvas.cpp
• src/player/Canvas.h
• src/player/DisplayEngine.cpp
• src/player/FontStyle.h
• src/player/Player.cpp
• src/player/SDLWindow.cpp
• src/player/SDLWindow.h
• src/player/SecondaryWindow.cpp
• src/test/AppTest.py
• src/test/MultiWindowTest.py
• src/test/baseline/testMultiWindowOutlines1.png
• src/test/baseline/testMultiWindowOutlines2.png
• src/test/baseline/testMultiWindowOutlines3.png
• src/video/testvideo.cpp