about summary refs log tree commit diff
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-04-28 01:00:34 +0200
committerAlexander Barton <alex@barton.de>2012-04-28 01:00:34 +0200
commit110be707c306683c666bd736a8dcd7aef86d9f21 (patch)
treed113a72d5269c81edd4265db26edf9e762c1ff8a /doc/Makefile.am
parentb2743af0ed438798f3025e253b157257b9774bd5 (diff)
parent76565022fbda9a4054d7f74a46439db4145e5655 (diff)
downloadngircd-110be707c306683c666bd736a8dcd7aef86d9f21.tar.gz
ngircd-110be707c306683c666bd736a8dcd7aef86d9f21.zip
Merge branch 'master' of /srv/git/ngircd
* 'master' of /srv/git/ngircd:
  "multi-prefix" capability 2/2: adjust NAME and WHO handlers
  "multi-prefix" capability 1/2: implement complete CAP infrastructure
  IRC_Send_NAMES(): Code cleanup
  New function Client_CapSet() in addition to Client_Cap{Add|Del}
  "CAP REQ" starts capability negotiation and delays user registration
  Xcode: update project file for Xcode 4.3
  Correctly handle "CAP END", new client type CLIENT_WAITCAPEND
  Implement core IRC capability handling and "CAP" command
  New "login" source file
  Introduce_Client() => Client_Introduce(), and move it to client.c
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r--doc/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1a792c5f..92e019b8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,6 +18,7 @@ SUFFIXES = .tmpl
 
 static_docs = \
 	Bopm.txt \
+	Capabilities.txt \
 	FAQ.txt \
 	GIT.txt \
 	HowToRelease.txt \