uae4all also suffers from recent linker changes - added missing -lm and -lz libraries
genesis: Add genesis gamegear emulator to emulationstation
genesis: Change core description
Merge pull request #515 from gizmo98/patch-3

Use Genesis-Plus-GX libretro core for gamegear emulation.
mujpen64 build script checks for 750mb free ram - testing the minimum needed now. disabled check but increased swap. May need to
increase swap file more - will test
Merge remote-tracking branch 'upstream/master'
Add USB,2-axis 8-button gamepad

http://blog.petrockblock.com/forums/topic/working-controller-config-files-attached/
Merge pull request #517 from gizmo98/patch-1

Add USB,2-axis 8-button gamepad
real location of retroarch-joyconfig

i changed the directory to the retroarch-joyconfig binary, which is under the tools directory now. current builds will are pointing to the old location still. if this binary is supposed to be moved/copied over to the old one of /installdir/bin/ then that needs to be changed instead as it is not working that way currently
Merge pull request #519 from ProxyCell/patch-1

real location of retroarch-joyconfig
basic.py: update retroarch-joyconfig path

Use the new file location like https://github.com/petrockblog/RetroPie-Setup/commit/3e029a9e2f453809723cd1847716f0d36b38e631.
Merge pull request #521 from gizmo98/patch-1

basic.py: update retroarch-joyconfig path
take a single parameter for ram in rpSwap - the total needed ram - rpSwap will calculate how much additional swap is needed
calculate toal memory just before adding additional swap just in case anything has changed since the script started (such as manually added swap, or in the case the script was interrupted and an old swap was still active)
use 750mb total ram for mupen64/libretro emulator - as upstream requests
Merge remote-tracking branch 'upstream/master'