Ryan Liptak b5fcb1f09f Merge branch '1.7.x' of https://github.com/squeek502/Squake into 1.8
# Conflicts:
#	java/squeek/quakemovement/QuakeClientPlayer.java
2017-11-29 00:33:17 -08:00
..