diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /src/wallclock.c | |
parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
merge bike with master, fix conflicts
Diffstat (limited to 'src/wallclock.c')
-rw-r--r-- | src/wallclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallclock.c b/src/wallclock.c index cd85de230..897576719 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -16,7 +16,7 @@ #include "task.h" #include "strings.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "trig.h" #include "decompress.h" |