Merge branch 'silc.1.1.branch' of silc repo
authorPekka Riikonen <priikone@silcnet.org>
Mon, 9 Jun 2008 13:50:02 +0000 (16:50 +0300)
committerPekka Riikonen <priikone@silcnet.org>
Mon, 9 Jun 2008 13:50:02 +0000 (16:50 +0300)
commitafcd9ed820b767d8b6676a9156fa561b24ac2363
treeed675f0b617a2afc597cc4f2a520a658014b3125
parent2f90e9e57682d83c4ed07df77c1c9b898cbc5702
parentff6a990d9e7361a5d1eb9909483bcea7decef4d4
Merge branch 'silc.1.1.branch' of silc repo

Conflicts:

CHANGES
Makefile.ad
Makefile.defines_int.in
README.PLUGIN
TODO
apps/Makefile.ad
apps/autodist/CHANGES
apps/autodist/autodist.in
apps/autodist/doc/autodist.1.in
apps/autodist/doc/autodist.texi
apps/irssi/Makefile.am
apps/irssi/configure.ad
apps/irssi/configure.in
apps/irssi/docs/Makefile.am
apps/irssi/docs/help/Makefile.am.gen
apps/irssi/docs/help/in/cmode.in
apps/irssi/docs/help/in/cumode.in
apps/irssi/docs/help/in/key.in
apps/irssi/scripts/Makefile.am
apps/irssi/scripts/examples/Makefile.am
apps/irssi/src/Makefile.am
apps/irssi/src/core/Makefile.am
apps/irssi/src/core/modules-load.c
apps/irssi/src/fe-common/silc/Makefile.am
apps/irssi/src/fe-common/silc/fe-common-silc.c
apps/irssi/src/fe-common/silc/fe-silc-messages.c
apps/irssi/src/fe-common/silc/module-formats.c
apps/irssi/src/fe-text/Makefile.am
apps/irssi/src/perl/Makefile.am
apps/irssi/src/silc/core/Makefile.am
apps/irssi/src/silc/core/client_ops.c
apps/irssi/src/silc/core/clientutil.c
apps/irssi/src/silc/core/silc-core.c
apps/irssi/src/silc/core/silc-servers.c
apps/silcd/Makefile.am
apps/silcd/command.c
apps/silcd/command_reply.c
apps/silcd/idlist.c
apps/silcd/idlist.h
apps/silcd/packet_receive.c
apps/silcd/packet_send.c
apps/silcd/server.c
apps/silcd/server.h
apps/silcd/server_backup.c
apps/silcd/server_http.c
apps/silcd/server_internal.h
apps/silcd/server_query.c
apps/silcd/server_query.h
apps/silcd/server_util.c
apps/silcd/server_util.h
apps/silcd/serverconfig.c
apps/silcd/serverconfig.h
apps/silcd/serverid.c
apps/silcd/silcd.c
configure.ad
distdir/autodist
distdir/client
distdir/common
distdir/default
distdir/post-dist
distdir/pre-dist-client
distdir/pre-dist-toolkit
distdir/server
distdir/toolkit
doc/Makefile.ad
doc/example_silcd.conf.in
doc/examples/silcd.prv
doc/examples/silcd.pub
doc/silcalgs.conf
doc/silcd.conf.yo
includes/silc.h.in
includes/silcversion.h.in
lib/Makefile.ad
lib/configure.ad
lib/contrib/Makefile.ad
lib/doc/command_reply_args.html
lib/doc/notifyargs.html
lib/doc/porting.html
lib/doc/silcclient_using.html
lib/silcapputil/silcapputil.c
lib/silcapputil/silcidcache.c
lib/silcapputil/silcidcache.h
lib/silcasn1/silcasn1_decode.c
lib/silcasn1/silcasn1_encode.c
lib/silcclient/client.c
lib/silcclient/client_connect.c
lib/silcclient/client_entry.c
lib/silcclient/client_entry.h
lib/silcclient/client_keyagr.c
lib/silcclient/client_notify.c
lib/silcclient/client_register.c
lib/silcclient/command.c
lib/silcclient/command_reply.c
lib/silcclient/silcclient.h
lib/silcclient/silcclient_entry.h
lib/silccore/DIRECTORY
lib/silccore/README
lib/silccore/silcargument.c
lib/silccore/silcattrs.c
lib/silccore/silcnotify.c
lib/silccore/silcpacket.c
lib/silccore/silcpacket.h
lib/silccrypt/Makefile.ad
lib/silccrypt/aes.c
lib/silccrypt/aes_x86.asm
lib/silccrypt/aes_x86_64.asm
lib/silccrypt/ciphers.h
lib/silccrypt/configure.ad
lib/silccrypt/rijndael_internal.h
lib/silccrypt/silccipher.c
lib/silccrypt/silcpk.c
lib/silccrypt/silcpkcs.c
lib/silccrypt/silcpkcs1.c
lib/silcmath/configure.ad
lib/silcsftp/sftp_client.c
lib/silcsftp/sftp_fs_memory.c
lib/silcsim/Makefile.ad
lib/silcske/silcconnauth.c
lib/silcske/silcske.c
lib/silcske/silcske.h
lib/silcskr/silcskr.c
lib/silcutil/silcatomic.h
lib/silcutil/silcbuffer.h
lib/silcutil/silcbuffmt.c
lib/silcutil/silcdlist.h
lib/silcutil/silcfsm.c
lib/silcutil/silclog.c
lib/silcutil/silcmime.c
lib/silcutil/silcnet.h
lib/silcutil/silcschedule.c
lib/silcutil/silcschedule.h
lib/silcutil/silcschedule_i.h
lib/silcutil/silcsocketstream_i.h
lib/silcutil/silcstack.h
lib/silcutil/silctime.c
lib/silcutil/silcutil.c
lib/silcutil/stacktrace.c
lib/silcutil/tests/test_silcschedule.c
lib/silcutil/unix/silcunixnet.c
lib/silcutil/unix/silcunixthread.c
tutorial/mybot/Makefile
tutorial/mybot/mybot.c
win32/libsilc/libsilc.def
win32/libsilcclient/libsilcclient.def
CHANGES
distdir/post-dist
lib/silcutil/silcbuffmt.c
lib/silcutil/silcconfig.c
lib/silcutil/silcfdstream.c
lib/silcutil/silcsocketstream.c
lib/silcutil/silcsocketstream_i.h
lib/silcutil/unix/silcunixnet.c
lib/silcutil/unix/silcunixschedule.c
lib/silcutil/unix/silcunixsocketstream.c