Refactor submap::trp to use public getters and setters instead.
Refactor submap::frn to getters/setters.
fix Mac build for SDL2 shared library
fix Mac build for SDL2 framework
update OSX compiling documentation
missing default value for returned variable
Merge pull request #2 from CleverRaven/master

pulling in the new stuff, updating my repo
Merge branch 'map-caching-invalidate' of https://github.com/BevapDin/Cataclysm-DDA into fixmerge
Merge branch 'master' of https://github.com/CIB/Cataclysm-DDA into fixmerge
Merge branch 'armor' of https://github.com/i2amroy/Cataclysm-DDA into input
Merge branch 'input-manager-auto_pickup.cpp' of https://github.com/BevapDin/Cataclysm-DDA into input
Merge branch 'input-manager-iexamine.cpp' of https://github.com/BevapDin/Cataclysm-DDA into input
Merge branch 'input-manager-crafting.cpp' of https://github.com/BevapDin/Cataclysm-DDA into input
Merge branch 'input-manager-options.cpp' of https://github.com/BevapDin/Cataclysm-DDA into input
Merge branch 'fix-ui-menu' of https://github.com/BevapDin/Cataclysm-DDA into input
Merge remote-tracking branch 'KA101/master' into FrankenMod
Merge remote-tracking branch 'CIB/map3d_submap_refactor' into FrankenMod
Set return type to void.
Merge remote-tracking branch 'KA101/master' into FrankenMod
Turn off PEDANTIC_INFO.