diff options
Diffstat (limited to 'src/example/CMakeLists.txt')
| -rw-r--r-- | src/example/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt index 3a5b543..5b7d7c2 100644 --- a/src/example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -28,6 +28,10 @@ add_example(proxy) add_example(db) add_example(ecs) add_example(scene_manager) +<<<<<<< HEAD +add_example(collision) +======= add_example(particles) add_example(gameloop) +>>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 |