summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-08-31 11:26:20 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-08-31 11:26:20 +0200
commit3aa51f2a13374f4e235a13533c552ec3504cb235 (patch)
tree9e9aaa4ccd94cd608103f5c8e173be99e59a1500 /configure.ac
parenta8b231875ba6990422f85bd60237c5a2f3c4e7d0 (diff)
parente3c90bf008d447bc087c4215a630ed023ca6a1b6 (diff)
downloadrsyslog-3aa51f2a13374f4e235a13533c552ec3504cb235.tar.gz
rsyslog-3aa51f2a13374f4e235a13533c552ec3504cb235.tar.xz
rsyslog-3aa51f2a13374f4e235a13533c552ec3504cb235.zip
Merge branch 'beta'
Conflicts: action.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions