Changeset 28c13da in opengl-game

Timestamp:

Aug 20, 2019, 8:18:44 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1187ef5

Parents:

d22ae72 (diff), 58b95b3 (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 medievaltech.com:opengl-game

(No files)