tree 3b535aefb8ea9ccd9a6ebd3bec7d346be6f6d7a1
parent 17dbf210c9fa08326f3c4c42d3c1e70ac8e49388
parent 045bdbe2e68c305f5f819744ccbe75c7478e4e8b
author David 'Digit' Turner <digit@google.com> 1398760868 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1398760868 +0000

Merge changes Ic91db7a3,I0ae2a1de,I4e0776db into idea133

* changes:
  Add '-accel <mode>' and 'no-accel' options.
  Add misc android/base/ helper classes.
  Windows: Fix libSDLmain compilation