diff options
| author | Alexander Barton <alex@barton.de> | 2012-09-11 12:30:19 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-09-11 12:30:19 +0200 |
| commit | f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2 (patch) | |
| tree | 1c1a9c7421b899a11a059b72615a7020b06ed7c2 /doc/.gitignore | |
| parent | f38a9035e5439cb395b2de6b9bdfa36102bfe80c (diff) | |
| parent | 097c72aa65d9914d688eaece718648ca060e287a (diff) | |
| download | ngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.tar.gz ngircd-f37600ee01f6cfd86e8fa80f77ee26ebaf3012b2.zip | |
Merge branch 'xop' of https://github.com/kart0ffelsack/ngircd into bug92-xop
* 'xop' of https://github.com/kart0ffelsack/ngircd: Tests and documentation for xop Implemented xop support Conflicts (because of merge of the 'cmode-M' branch): src/ngircd/channel.c src/ngircd/defines.h src/ngircd/messages.h
Diffstat (limited to 'doc/.gitignore')
| -rw-r--r-- | doc/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/.gitignore b/doc/.gitignore index 0035855c..a7b6a22c 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1 +1,2 @@ sample-ngircd.conf +Add_Modes.txt |