summaryrefslogtreecommitdiff
path: root/asm/string_util.s
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2016-11-01 10:56:23 -0500
committerDiegoisawesome <diego@domoreaweso.me>2016-11-01 10:56:23 -0500
commitf09f9cef752c37e3cc0686573c1fdb29da842772 (patch)
tree22bee285750a6739643859eb6afd52be4ded87e1 /asm/string_util.s
parent442002dada4183c96b5ec09fcde8486aa5ba29b1 (diff)
parent4db33778ad3faa64d994f46358a28c22c393f7c6 (diff)
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/string_util.s')
-rw-r--r--asm/string_util.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/string_util.s b/asm/string_util.s
index 6eda21515..47840c5a7 100644
--- a/asm/string_util.s
+++ b/asm/string_util.s
@@ -1,4 +1,4 @@
- .include "asm/macros.s"
+ .include "asm/macros.inc"
.syntax unified