[Pkg-silc-commits] [SCM] terminal based SILC client branch, master, updated. debian/1.1.7-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit a6cbe8800e25cfed3b51d60c3bc8bb5b483e8e30
Merge: e8b9377f01e6d76736f4a9db0305ddb23dfc8051 aefc800b7a32d89502b796fe7829de7261f813b3
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Jun 25 18:08:04 2009 +0200

    Merge commit 'upstream/1.1.7'
    
    Conflicts:
    	ChangeLog
    	Makefile.am
    	Makefile.in
    	aclocal.m4
    	apps/Makefile.am
    	apps/Makefile.in
    	apps/irssi/INSTALL
    	apps/irssi/Makefile.in
    	apps/irssi/aclocal.m4
    	apps/irssi/configure
    	apps/irssi/configure.in
    	apps/irssi/docs/Makefile.in
    	apps/irssi/docs/help/Makefile.in
    	apps/irssi/docs/help/in/Makefile.in
    	apps/irssi/irssi-version.h.in
    	apps/irssi/scripts/Makefile.in
    	apps/irssi/scripts/examples/Makefile.in
    	apps/irssi/silc-client.spec
    	apps/irssi/src/Makefile.in
    	apps/irssi/src/core/Makefile.in
    	apps/irssi/src/fe-common/Makefile.in
    	apps/irssi/src/fe-common/core/Makefile.in
    	apps/irssi/src/fe-common/silc/Makefile.in
    	apps/irssi/src/fe-text/Makefile.in
    	apps/irssi/src/lib-config/Makefile.in
    	apps/irssi/src/lib-popt/Makefile.in
    	apps/irssi/src/perl/Makefile.in
    	apps/irssi/src/silc/Makefile.in
    	apps/irssi/src/silc/core/Makefile.in
    	apps/irssi/src/silc/core/client_ops.c
    	apps/irssi/src/silc/core/clientutil.c
    	apps/irssi/src/silc/core/clientutil.h
    	apps/irssi/src/silc/core/silc-channels.c
    	apps/irssi/src/silc/core/silc-queries.c
    	apps/irssi/src/silc/core/silc-servers.c
    	apps/irssi/src/silc/core/silc-servers.h
    	config.guess
    	config.sub
    	configure
    	configure.ac
    	depcomp
    	doc/Makefile.am
    	doc/Makefile.in
    	doc/silc.1
    	includes/Makefile.am
    	includes/Makefile.in
    	includes/silc.h
    	includes/silcdistdefs.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/silcasn1.c
    	lib/silcasn1/silcasn1_encode.c
    	lib/silcclient/Makefile.am
    	lib/silcclient/Makefile.in
    	lib/silcclient/client.c
    	lib/silcclient/client.h
    	lib/silcclient/client_channel.c
    	lib/silcclient/client_entry.c
    	lib/silcclient/client_internal.h
    	lib/silcclient/client_keyagr.c
    	lib/silcclient/client_notify.c
    	lib/silcclient/command_reply.c
    	lib/silcclient/silcclient.h
    	lib/silcclient/tests/Makefile.in
    	lib/silccore/Makefile.am
    	lib/silccore/Makefile.in
    	lib/silccore/silcpacket.c
    	lib/silccore/silcpacket.h
    	lib/silccrypt/Makefile.am
    	lib/silccrypt/Makefile.in
    	lib/silcmath/Makefile.am
    	lib/silcmath/Makefile.in
    	lib/silcsftp/Makefile.am
    	lib/silcsftp/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/unix/Makefile.in
    	lib/silcutil/unix/silcunixschedule.c
    	lib/silcutil/win32/Makefile.in
    	lib/silcvcard/Makefile.am
    	lib/silcvcard/Makefile.in
    	ltmain.sh
    	silcdefs.h.in


-- 
terminal based SILC client