diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-03 11:54:20 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-03 11:54:20 +0200 |
| commit | 8d4a5152cba02d35e55046a687eaddd56dc581fd (patch) | |
| tree | 3299ddbeb81f4c6d6376017c3fb82a63be98c9c8 /action.c | |
| parent | 99e21ffa873e2ee3e12640f675e6c8556224229c (diff) | |
| parent | 2a647f6b631ac733dd32dd5995867df213dff402 (diff) | |
| download | rsyslog-8d4a5152cba02d35e55046a687eaddd56dc581fd.tar.gz rsyslog-8d4a5152cba02d35e55046a687eaddd56dc581fd.tar.bz2 rsyslog-8d4a5152cba02d35e55046a687eaddd56dc581fd.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -98,7 +98,7 @@ #include <strings.h> #include <time.h> #include <errno.h> -#include <json/json.h> +#include <json.h> #include "dirty.h" #include "template.h" |