Changeset 2b40f48 in opengl-game for scene-notes.txt

Timestamp:

Dec 5, 2019, 5:48:59 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

7c929fc

Parents:

785333b (diff), cf727ca (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' into hotfix/ship-shader-lights

(No files)