summaryrefslogtreecommitdiffstats
path: root/runtime/typedefs.h
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-18 15:46:33 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-18 15:46:33 +0200
commite14d353e69a75290c3e4004df79f42a22bfe4cab (patch)
tree7d74717632ca25ea585aa30df87d43c1e2f4af3d /runtime/typedefs.h
parent179a27d80d6c13625d5f9cee9b15acbd5fb33651 (diff)
parentc1108d7af1ca04b2c485bd87a8cbbf044ffde6fb (diff)
downloadrsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.gz
rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.tar.bz2
rsyslog-e14d353e69a75290c3e4004df79f42a22bfe4cab.zip
Merge branch 'beta'
Conflicts: runtime/queue.c
Diffstat (limited to 'runtime/typedefs.h')
0 files changed, 0 insertions, 0 deletions