diff options
| author | John Denker <jsd@av8n.com> | 2012-07-30 14:34:05 -0700 |
|---|---|---|
| committer | John Denker <jsd@av8n.com> | 2012-07-30 14:34:05 -0700 |
| commit | 7024dc330299921af649330c45b99c21c3d7f022 (patch) | |
| tree | 9f747a0423647b016376fe353ceea197a5848cbf /.gitignore | |
| parent | ce0dbe5332d4eb921c09cc48cc52634211d7089a (diff) | |
| parent | f8be4baf5a2318363b42f8883f66ed8a976dfc79 (diff) | |
Merge branch 'master' of ephedra:usr/src/qmail into e_master
Conflicts:
tools/makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -10,6 +10,7 @@ *#[0-9]* \#*# +ucspi-tcp-0.88-ipv6.patch has?????.h auto-gid auto-int @@ -162,3 +163,4 @@ data.tar.gz dummy-mail-transfer-agent_all.deb bash-c wripper +ltgrey |