diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 12:47:28 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-01 12:47:28 +0100 |
| commit | facf8cc3e65cab8b8c8a08cea51970386cba539f (patch) | |
| tree | 49cfdd6808467bfe4838555abb63ecdd1f5e3794 /action.h | |
| parent | f9ec561e6ee96e2c864bb69773ad6fc7303aef58 (diff) | |
| parent | 01e6df368cdec89920d075fe096971481cb8ce49 (diff) | |
| download | rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.tar.gz rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.tar.xz rsyslog-facf8cc3e65cab8b8c8a08cea51970386cba539f.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
runtime/ctok.c
Diffstat (limited to 'action.h')
0 files changed, 0 insertions, 0 deletions