g++4.6 compatibility
Merge branch 'network_multiplayer' of github.com:DemonTPx/smashbattle into network_multiplayer
Merge branch 'network_multiplayer' of github.com:DemonTPx/smashbattle into network_multiplayer
Fix for g++ 4.6