rsyslog.git/doc/omfile.html, branch master rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'c1-streamzip' into master-streamzip 2012-10-05T10:45:14+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-05T10:45:14+00:00 5a596871194cb4c573bea7cbbd9c96e07dd27dd4 Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c 
Conflicts:
	ChangeLog
	configure.ac
	doc/rsyslog_conf_global.html
	runtime/stream.c
	tools/omfile.c
doc: new template system, some more output modules 2012-08-28T07:44:35+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-08-28T07:44:35+00:00 dfd541a1224a2ed407010e9924b6eab66c4643ba added base doc for new config language 
added base doc for new config language
doc: improved doc for built-in modules 2012-07-24T10:54:56+00:00 Florian Riedl friedel@adiscon.com 2012-07-24T10:54:56+00:00 9900fbe2e85f39b999f50d2ba4463d507f731f4c