Timestamp:
Aug 4, 2017, 5:54:39 PM (7 years ago)
Author:
Dmitry Portnoy <dmitry.portnoy@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
8b7cfcf
Parents:
ec4456b (diff), 772d8c7 (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.