summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-21 15:42:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-21 15:42:11 +0200
commitb71ef4abad365f95cf7adf3df14083940d531f1f (patch)
treec5744b7c3adb4e7ede7a282949cbfe41e414c813 /Makefile
parentb1a905c5eb7833d661be4a910697f49deb34c640 (diff)
parent86225089f2d0e82deb368e1688464e8ba84d24cf (diff)
downloadrsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.tar.gz
rsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.tar.xz
rsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.zip
Merge branch 'v5-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions