gnome-keyring r891 - in trunk: . daemon pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: 2007-11-28 18:15:13 +0000 (Wed, 28 Nov 2007)
New Revision: 891
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-keyring?rev=891&view=rev

Removed:
   trunk/pkcs11/gkr-pkcs11-daemon-test.c
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/daemon/Makefile.am
   trunk/daemon/gkr-daemon.c
   trunk/pkcs11/Makefile.am
   trunk/pkcs11/gkr-pkcs11-daemon.c
   trunk/pkcs11/gkr-pkcs11-daemon.h
Log:
	* daemon/gkr-daemon.c:
	* daemon/Makefile.am:
	* pkcs11/gkr-pkcs11-daemon.c:
	* pkcs11/gkr-pkcs11-daemon.h:
	* pkcs11/gkr-pkcs11-daemon-test.c: (removed)
	* Makefile.am: Integrate PKCS#11 daemon code into the main daemon.