diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
| commit | 37c016f1d5902cf7bbfed08d13ee2bc6ef725add (patch) | |
| tree | ce9de85b6d5ffd43d2e798b5310df883705f5ca8 /src/example/CMakeLists.txt | |
| parent | de1c6053033483c7e824f8018d75be6af424d14d (diff) | |
| parent | 337a957a9e605f16287506b6afda56950e562db3 (diff) | |
merge with wouter/events
Diffstat (limited to 'src/example/CMakeLists.txt')
| -rw-r--r-- | src/example/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt index 5b7d7c2..d2ea926 100644 --- a/src/example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -28,10 +28,8 @@ add_example(proxy) add_example(db) add_example(ecs) add_example(scene_manager) -<<<<<<< HEAD add_example(collision) -======= +add_example(events) add_example(particles) add_example(gameloop) ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 |