Merge and uncrustify.

This commit is contained in:
Patrick Johnmeyer 2016-02-04 21:16:45 -06:00
parent 89ff2596ee
commit 74ca0c301f
8 changed files with 804 additions and 826 deletions