diff options
| author | victorfisac <[email protected]> | 2017-04-16 14:03:39 +0200 |
|---|---|---|
| committer | victorfisac <[email protected]> | 2017-04-16 14:03:39 +0200 |
| commit | 8849a4c7526ee6a321df9393dd69d0b29820311a (patch) | |
| tree | dc7d70f10ecdb971d51de03fb1ea995a68e3d1eb /examples/models/resources | |
| parent | 82577ededc43f2673c46d3356cfa3e0746e012a5 (diff) | |
| parent | f5894278b74df34d7850438c36f9d7202ea08091 (diff) | |
| download | raylib-8849a4c7526ee6a321df9393dd69d0b29820311a.tar.gz raylib-8849a4c7526ee6a321df9393dd69d0b29820311a.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'examples/models/resources')
| -rw-r--r-- | examples/models/resources/tower.obj (renamed from examples/models/resources/model/lowpoly-tower.obj) | 0 | ||||
| -rw-r--r-- | examples/models/resources/tower.png (renamed from examples/models/resources/model/lowpoly-tower.png) | bin | 24939 -> 24939 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/examples/models/resources/model/lowpoly-tower.obj b/examples/models/resources/tower.obj index ea03a9fc..ea03a9fc 100644 --- a/examples/models/resources/model/lowpoly-tower.obj +++ b/examples/models/resources/tower.obj diff --git a/examples/models/resources/model/lowpoly-tower.png b/examples/models/resources/tower.png Binary files differindex 7c9239e2..7c9239e2 100644 --- a/examples/models/resources/model/lowpoly-tower.png +++ b/examples/models/resources/tower.png |
