diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-15 09:07:05 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-15 09:07:05 -0400 |
| commit | ef74ae83db1d3049e4e890df77d25ac6e1f7719f (patch) | |
| tree | 15b01f3ac4f4f2ef06e6fe463ce5e053b26a02e2 /include/entities.h | |
| parent | 5adabb82443b9b10b25cdd8b4db3cfe890e36fa1 (diff) | |
Added glew and shader loading
Diffstat (limited to 'include/entities.h')
| -rw-r--r-- | include/entities.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/entities.h b/include/entities.h index fc2f35c..5b6bcf1 100644 --- a/include/entities.h +++ b/include/entities.h @@ -100,7 +100,3 @@ ENTITY TYPES <<<<<<< HEAD |->1 Rabbit **/ -======= -|->1 Skirl -**/ ->>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187 |