Paul - I suggest we publish version 2.2.1 (current master, with SDL 1.3), since there are a few bugfixes and controller fixes.
Then we may as well go ahead and merge this to master. I feel a little stalled right now because there are three major branches (master, sdl2, and glide) and any more branches would really complicate things. Worst case scenario, we can always compile with SDL 1.3 even after the merge by changing just a few lines of code (makefile and lib loading in java). (The only drawback is that including both versions increases the APK size.) No rush to publish the merged version, but when we do I suggest we bump the version to 2.3.0.