[Pkg-silc-commits] [SCM] developer files for SILC library (silc-toolkit) branch, master, updated. b67d99ea3c8f8cb570d793f98a2a2092d655f50e

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 9cf2c5e16522dbf1c9e77151e05ddbb74cd5ae92
Merge: 83862c95156c64111414cef3dbd5855759129f09 37bfe7c66939b688d9b8e64cb90e04dee654b021
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Jun 25 17:02:29 2009 +0200

    Merge commit 'upstream/1.1.9'
    
    Conflicts:
    	ChangeLog
    	Makefile.am
    	Makefile.in
    	aclocal.m4
    	apps/Makefile.am
    	apps/Makefile.in
    	config.guess
    	config.sub
    	configure
    	configure.ac
    	depcomp
    	doc/Makefile.am
    	doc/Makefile.in
    	doc/draft-riikonen-silc-commands-07.txt
    	doc/draft-riikonen-silc-ke-auth-09.txt
    	doc/draft-riikonen-silc-pp-09.txt
    	doc/draft-riikonen-silc-spec-09.txt
    	doc/toolkit/index.html
    	doc/toolkit/silcclient-SilcClientConnectionParams.html
    	doc/toolkit/silcdoc_xref
    	doc/toolkit/silcidcache-silc_idcache_del_by_context.html
    	doc/toolkit/silclog-SILC_ASSERT.html
    	doc/toolkit/silclog-SILC_VERIFY.html
    	doc/toolkit/toolkit_index.html
    	includes/Makefile.am
    	includes/Makefile.in
    	includes/silcdistdefs.h
    	includes/silcversion.h
    	lib/Makefile.am
    	lib/Makefile.in
    	lib/contrib/Makefile.am
    	lib/contrib/Makefile.in
    	lib/silcapputil/Makefile.am
    	lib/silcapputil/Makefile.in
    	lib/silcapputil/silcidcache.c
    	lib/silcapputil/silcidcache.h
    	lib/silcasn1/Makefile.am
    	lib/silcasn1/Makefile.in
    	lib/silcasn1/tests/Makefile.in
    	lib/silcclient/Makefile.am
    	lib/silcclient/Makefile.in
    	lib/silcclient/client.c
    	lib/silcclient/client.h
    	lib/silcclient/client_entry.c
    	lib/silcclient/client_keyagr.c
    	lib/silcclient/silcclient.h
    	lib/silcclient/tests/Makefile.in
    	lib/silccore/Makefile.am
    	lib/silccore/Makefile.in
    	lib/silccore/silcpacket.c
    	lib/silccore/tests/Makefile.in
    	lib/silccrypt/Makefile.am
    	lib/silccrypt/Makefile.in
    	lib/silccrypt/tests/Makefile.in
    	lib/silchttp/Makefile.am
    	lib/silchttp/Makefile.in
    	lib/silchttp/silchttpserver.c
    	lib/silchttp/tests/Makefile.in
    	lib/silcmath/Makefile.am
    	lib/silcmath/Makefile.in
    	lib/silcsftp/Makefile.am
    	lib/silcsftp/Makefile.in
    	lib/silcsftp/tests/Makefile.in
    	lib/silcsim/Makefile.am
    	lib/silcsim/Makefile.in
    	lib/silcske/Makefile.am
    	lib/silcske/Makefile.in
    	lib/silcske/silcske.c
    	lib/silcske/silcske_i.h
    	lib/silcskr/Makefile.am
    	lib/silcskr/Makefile.in
    	lib/silcskr/silcskr.c
    	lib/silcutil/Makefile.am
    	lib/silcutil/Makefile.in
    	lib/silcutil/silclog.h
    	lib/silcutil/silcschedule.c
    	lib/silcutil/silcsocketstream.c
    	lib/silcutil/symbian/Makefile.in
    	lib/silcutil/tests/Makefile.in
    	lib/silcutil/unix/Makefile.in
    	lib/silcutil/unix/silcunixschedule.c
    	lib/silcutil/win32/Makefile.in
    	lib/silcvcard/Makefile.am
    	lib/silcvcard/Makefile.in
    	ltmain.sh
    	silc-toolkit.spec
    	silcdefs.h.in
    	tutorial/Makefile.defines
    	tutorial/Makefile.defines_int
    	win32/Makefile.in
    	win32/libsilc/Makefile.in
    	win32/libsilcclient/Makefile.in


-- 
developer files for SILC library (silc-toolkit)