diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 16:01:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 16:01:12 +0200 |
| commit | 91b590916893031e7313a9f94551e708c1a02cd2 (patch) | |
| tree | 59b89d1214470a90ae8f0387725629ed1c50811e /srUtils.c | |
| parent | 9ae630384e1d95d7289f44c8ac20597311704914 (diff) | |
| parent | 894ba37a55f5f723e3b87e87262707903b2ed6a2 (diff) | |
| download | rsyslog-91b590916893031e7313a9f94551e708c1a02cd2.tar.gz rsyslog-91b590916893031e7313a9f94551e708c1a02cd2.tar.xz rsyslog-91b590916893031e7313a9f94551e708c1a02cd2.zip | |
clean up the mess we created in CVS
This is an attempt to clean up the CVS import. In CVS, we applied the
patches manually to each branch. Of course, this now results in lots and
lots of conflicts when we try to do a git merge. I have now merged, but
copied the v3-stable files back unaltered. The idea is that once this
is committed we will be able to merge new changes to the v2-stable branch
into v3-stable without any further problems.
Conflicts:
ChangeLog
cfsysline.c
configure.ac
doc/Makefile.am
doc/features.html
doc/history.html
doc/manual.html
doc/professional_support.html
doc/property_replacer.html
doc/rsyslog_conf.html
doc/status.html
gss-misc.h
linkedlist.c
module-template.h
modules.c
msg.c
omfile.c
omfwd.c
pidfile.c
plugins/omgssapi/Makefile.am
plugins/omgssapi/omgssapi.c
rfc3195d.8
rklogd.8
rsyslog.conf.5
rsyslog.h
rsyslogd.8
stringbuf.c
syslogd.c
syslogd.h
tcpsyslog.c
tcpsyslog.h
Diffstat (limited to 'srUtils.c')
0 files changed, 0 insertions, 0 deletions