projects / silc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 711fe01 5c43a88)
Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch
authorPekka Riikonen <priikone@silcnet.org>
Sat, 22 Nov 2008 16:14:35 +0000 (18:14 +0200)
committerPekka Riikonen <priikone@silcnet.org>
Sat, 22 Nov 2008 16:14:35 +0000 (18:14 +0200)
commit3192ac4ddd09cd3fabe10a88cd5c885f217650a4
treec33adefb2ee9faabf0b3177880b4424ade1dfe40tree | snapshot
parent711fe01f210030b40ce0aeceb1c18526632ba5b8commit | diff
parent5c43a88e369950a34b1c40d655b598bedd16bedacommit | diff
Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch

Code cleanup during merge.

Reverted External IP commit

Reverted changes to silcsocketstream API.  The user context can be now
set to SilcClientConnectionParams.  Increased shared library revision to
avoid backwards incompatiblity.

Signed-off-by: Pekka Riikonen <priikone@silcnet.org>
15 files changed:
apps/irssi/src/silc/core/client_ops.c diff1 | diff2 | blob | history
apps/irssi/src/silc/core/clientutil.c diff1 | diff2 | blob | history
apps/irssi/src/silc/core/clientutil.h diff1 | diff2 | blob | history
apps/irssi/src/silc/core/silc-queries.c diff1 | diff2 | blob | history
apps/irssi/src/silc/core/silc-servers.c diff1 | diff2 | blob | history
apps/silcd/packet_receive.c diff1 | diff2 | blob | history
apps/silcd/server.c diff1 | diff2 | blob | history
apps/silcd/server_util.c diff1 | diff2 | blob | history
lib/configure.ad diff1 | diff2 | blob | history
lib/silcclient/client.c diff1 | diff2 | blob | history
lib/silcclient/client.h diff1 | diff2 | blob | history
lib/silcclient/client_entry.c diff1 | diff2 | blob | history
lib/silcclient/silcclient.h diff1 | diff2 | blob | history
lib/silcske/silcske.c diff1 | diff2 | blob | history
lib/silcske/silcske_i.h diff1 | diff2 | blob | history
SILC - Secure Internet Live Conferencing