Timestamp:
Jul 19, 2017, 3:01:33 AM (7 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
5272b6b
Parents:
669c4e6 (diff), 1f63bdb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of http://medievaltech.com/git/opengl-game

(No files)

Note: See TracChangeset for help on using the changeset viewer.