diff options
| author | Mike Pall <mike> | 2016-03-03 12:11:37 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-03-03 12:11:37 +0100 |
| commit | f4231949b5e14e1116452f9e9eea31e19a462c82 (patch) | |
| tree | 8201252fca8a867ea4d1c33736f1a4dbfd77de6b /src/lj_gc.h | |
| parent | 6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff) | |
| parent | db1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff) | |
| download | luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2 luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_gc.h')
| -rw-r--r-- | src/lj_gc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_gc.h b/src/lj_gc.h index 847eb783..eee09afb 100644 --- a/src/lj_gc.h +++ b/src/lj_gc.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** Garbage collector. | 2 | ** Garbage collector. |
| 3 | ** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef _LJ_GC_H | 6 | #ifndef _LJ_GC_H |