projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
apps
/
irssi
/
src
/
fe-common
/
silc
/
module-formats.h
diff --git
a/apps/irssi/src/fe-common/silc/module-formats.h
b/apps/irssi/src/fe-common/silc/module-formats.h
index 7df09206b9ec5be9a67ed4a584c2eb715e912e71..f46e6ea2862d7b8e4edbdfc35be8b452de825b22 100644
(file)
--- a/
apps/irssi/src/fe-common/silc/module-formats.h
+++ b/
apps/irssi/src/fe-common/silc/module-formats.h
@@
-1,16
+1,15
@@
/*
/*
- module
s
-formats.h
+ module-formats.h
- Author: Pekka Riikonen <priikone@
poseidon.pspt.fi
>
+ Author: Pekka Riikonen <priikone@
silcnet.org
>
- Copyright (C) 2001 Pekka Riikonen
+ Copyright (C) 2001
- 2003
Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; version 2 of the License.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@
-22,9
+21,9
@@
enum {
SILCTXT_MODULE_NAME,
enum {
SILCTXT_MODULE_NAME,
-
+
SILCTXT_FILL_1,
SILCTXT_FILL_1,
-
+
SILCTXT_CHANNEL_FOUNDER_YOU,
SILCTXT_CHANNEL_FOUNDER,
SILCTXT_CHANNEL_TOPIC,
SILCTXT_CHANNEL_FOUNDER_YOU,
SILCTXT_CHANNEL_FOUNDER,
SILCTXT_CHANNEL_TOPIC,
@@
-77,6
+76,9
@@
enum {
SILCTXT_NO_MSGS_SENT,
SILCTXT_OWN_MSG_PRIVATE_SIGNED,
SILCTXT_OWN_MSG_PRIVATE_QUERY_SIGNED,
SILCTXT_NO_MSGS_SENT,
SILCTXT_OWN_MSG_PRIVATE_SIGNED,
SILCTXT_OWN_MSG_PRIVATE_QUERY_SIGNED,
+ SILCTXT_CHANNEL_PK_LIST,
+ SILCTXT_CHANNEL_PK_LIST_ENTRY,
+ SILCTXT_CHANNEL_PK_NO_LIST,
SILCTXT_FILL_2,
SILCTXT_FILL_2,