diff options
| author | Colin Noga <Tempus@Spectrum-Song.local> | 2011-06-26 11:36:45 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@Spectrum-Song.local> | 2011-06-26 11:36:45 -0500 |
| commit | aaec1327c178ae951a0b19a8150a69fc00eb3011 (patch) | |
| tree | 7d979ff369f412604ba75def8d58f17c7827a06d /NewerProject.yaml | |
| parent | 86b23638c773f42f1b7c56adb31eb16d1c417913 (diff) | |
| parent | 673484e580337cd1ab14bfd43c770f004494b9a4 (diff) | |
| download | kamek-aaec1327c178ae951a0b19a8150a69fc00eb3011.tar.gz kamek-aaec1327c178ae951a0b19a8150a69fc00eb3011.zip | |
Merge branch 'level-select' of treeki:newergit/Kamek into level-select
Conflicts:
NewerProject.yaml
kamek_pal.x
Diffstat (limited to '')
| -rw-r--r-- | NewerProject.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/NewerProject.yaml b/NewerProject.yaml index 4f95d8d..acfa899 100644 --- a/NewerProject.yaml +++ b/NewerProject.yaml @@ -18,5 +18,9 @@ modules: # - processed/replay.yaml
- processed/growup.yaml
- processed/levelspecial.yaml
+<<<<<<< HEAD - processed/eventlooper.yaml
- processed/spritespawner.yaml
+======= + - processed/compression.yaml
+>>>>>>> 673484e580337cd1ab14bfd43c770f004494b9a4 |