fix State.h after bad merge

This commit is contained in:
Stephen Birarda 2015-08-18 11:51:23 -07:00
parent 0f77ab8611
commit aa1c36e61a