diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:54:44 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:54:44 +0100 |
| commit | 05bd696ebb7766f33b3ae176b841bcecb0bfedfc (patch) | |
| tree | 99437759863ee4b25174f49aa69807c207176a76 /tests/.gitignore | |
| parent | 9048c16d90177a0dfa4131266ae73f029a5923c8 (diff) | |
| parent | ba201a941435bc5fec2c333155e1a8e16c4a9c05 (diff) | |
| download | rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.tar.gz rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.tar.xz rsyslog-05bd696ebb7766f33b3ae176b841bcecb0bfedfc.zip | |
Merge branch 'master' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tests/.gitignore')
| -rw-r--r-- | tests/.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index e961c766..a8177ad4 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,3 @@ -rscript_parse +rscript rt_init tmp |