fix_typo                  824d746 Merge pull request #17 from sparkprime/more_array
  joystick                  2d6fd61 Initial support for joysticks on Linux
* joystick_fix              824d746 Merge pull request #17 from sparkprime/more_array
  master                    824d746 Merge pull request #17 from sparkprime/more_array
  remotes/origin/HEAD       -> origin/master
  remotes/origin/master     824d746 Merge pull request #17 from sparkprime/more_array
  remotes/origin/more_array 40c28c4 Remove generated code from bloom shaders