summaryrefslogtreecommitdiffstats
path: root/runtime/typedefs.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-17 09:28:14 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-17 09:28:14 +0200
commit1aa39821f35d0e0fa7a3a621ebd5dc405ff844f1 (patch)
tree97103f1290c4d0c38a8d62f0a74f71bd1e9fef8e /runtime/typedefs.h
parent172d35532c94576aad2a6e97b8bee3bc36aa3b57 (diff)
parent76300a1342936161d1c82ab39e98193dcc00307d (diff)
downloadrsyslog-1aa39821f35d0e0fa7a3a621ebd5dc405ff844f1.tar.gz
rsyslog-1aa39821f35d0e0fa7a3a621ebd5dc405ff844f1.tar.bz2
rsyslog-1aa39821f35d0e0fa7a3a621ebd5dc405ff844f1.zip
Merge branch 'v6-devel'
Conflicts: template.c
Diffstat (limited to 'runtime/typedefs.h')
0 files changed, 0 insertions, 0 deletions