eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into dev

Browse Source
This commit is contained in:
milek7
2017-12-25 18:27:10 +01:00
parent 0aaeda576e 1b5e6aafd1
commit a215a0f8b3
65 changed files with 5288 additions and 4558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
material.h
View File

@@ -55,7 +55,6 @@ private:
std::string
find_on_disk( std::string const &Materialname ) const;
// members:
material_handle const npos { -1 };
material_sequence m_materials;
index_map m_materialmappings;