Lukas W 8f3ab4b1b0 Merge branch 'master' into fix/msvc ...

# Conflicts:
#	plugins/LadspaEffect/CMakeLists.txt
#	plugins/Xpressive/Xpressive.cpp
#	plugins/opl2/CMakeLists.txt
#	plugins/papu/CMakeLists.txt
#	plugins/xpressive/CMakeLists.txt
#	src/CMakeLists.txt

2017-11-22 17:34:22 +01:00

..

game-music-emu @ 21a064ea66

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

artwork.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_7.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_15.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_down.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_off.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_on.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

btn_up.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

CMakeLists.txt

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

FreeBoy.cpp

Merge branch 'master' into fix/msvc

2017-11-22 17:34:22 +01:00

FreeBoy.h

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

Gb_Apu_Buffer.cpp

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

Gb_Apu_Buffer.h

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00

logo.png

Rename papu to FreeBoy

2017-11-08 20:47:22 -05:00