diff options
| author | tom <tom@ground-control> | 2015-05-08 08:07:11 -0500 |
|---|---|---|
| committer | tom <tom@ground-control> | 2015-05-08 08:07:11 -0500 |
| commit | dddcaa7e5fa044972e25e456315c5cba361fc0f5 (patch) | |
| tree | 299180915292000b2d5029888eb75178b81e8053 /inc/list.hpp | |
| parent | 84f94931fa790572b3ce57d72e290f0bd860c661 (diff) | |
| parent | c63d77ddddb69ef0f641d90a8c3922fdc356224c (diff) | |
Merge branch 'master' of https://github.com/MajorTom6/natures
Conflicts:
src/list.cpp
Diffstat (limited to 'inc/list.hpp')
| -rw-r--r-- | inc/list.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/list.hpp b/inc/list.hpp index 96509aa..074e045 100644 --- a/inc/list.hpp +++ b/inc/list.hpp @@ -15,7 +15,7 @@ class List double Distance(Location A, Location B); private: - //Window main; + //vectors containing objects of each type std::vector<Resource> R; std::vector<Creature> C; std::vector<Location> L; |