aboutsummaryrefslogtreecommitdiff
path: root/src/lj_str.h
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-06 00:12:45 +0100
committerMike Pall <mike>2015-01-06 00:12:45 +0100
commit0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch)
tree79adfce53c856e0b066683352fd95cb40c97b3c5 /src/lj_str.h
parentc71cdf4c36145dd052734779d297fdbd7455468f (diff)
parent86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff)
downloadluajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_str.h')
-rw-r--r--src/lj_str.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_str.h b/src/lj_str.h
index cd1bc215..d8465de6 100644
--- a/src/lj_str.h
+++ b/src/lj_str.h
@@ -1,6 +1,6 @@
1/* 1/*
2** String handling. 2** String handling.
3** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h 3** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
4*/ 4*/
5 5
6#ifndef _LJ_STR_H 6#ifndef _LJ_STR_H