diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
commit | 3b457d49854503807fa019d9c44a9daf6c79dba0 (patch) | |
tree | 8c1b1e7a2443ac6cb1f1a4a561bf717cc1dd1246 /src/meta.c | |
parent | d357cdd882cc0cf6afb15686834f5d9d6efab57f (diff) | |
parent | 86b965bdab8dc8735c4a846ec09bfbbadfae780b (diff) |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/payload.c
Diffstat (limited to 'src/meta.c')
-rw-r--r-- | src/meta.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -61,6 +61,7 @@ static const struct datatype realm_type = { .basetype = &integer_type, .print = realm_type_print, .parse = realm_type_parse, + .flags = DTYPE_F_PREFIX, }; static void tchandle_type_print(const struct expr *expr) |