summaryrefslogtreecommitdiffstats
path: root/plugins/omgssapi/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-20 16:03:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-20 16:03:51 +0200
commit534e07d738fc5c7f5464ab94a010cc7113dfad2c (patch)
tree389432aabff3f72aee014452f7b449f41e829315 /plugins/omgssapi/Makefile.am
parent527edddb4646c24fa9a587601cd90d7a57a1fcf0 (diff)
parent74000ea71eb47c19653e0cd7bbffb83d913c3923 (diff)
downloadrsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.gz
rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.xz
rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.zip
Merge branch 'v4-devel' into master
Conflicts: plugins/imsolaris/imsolaris.c tests/Makefile.am
Diffstat (limited to 'plugins/omgssapi/Makefile.am')
0 files changed, 0 insertions, 0 deletions