diff options
| author | Brendan Punsky <bpunsky@gmail.com> | 2019-03-13 16:45:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 16:45:46 -0400 |
| commit | eadb66c9efc19ad1deaee6ca5a141cbd7206fcce (patch) | |
| tree | 01eb1a33ffba203c45460e0e50da4b5f4ca31076 /src/string.cpp | |
| parent | 9d7e1c17cc4a9b0d6cfd4c741c800b5732eb9948 (diff) | |
| parent | bdab5e00da6dee80b7582135815f2183def935bb (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/string.cpp')
| -rw-r--r-- | src/string.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/string.cpp b/src/string.cpp index 5f4a28960..39219789f 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -308,7 +308,6 @@ String directory_from_path(String const &s) { return substring(s, 0, i); } - String concatenate_strings(gbAllocator a, String const &x, String const &y) { isize len = x.len+y.len; u8 *data = gb_alloc_array(a, u8, len+1); |