projects / platform / upstream / gcr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29ce091 95aec98)
Merge branch 'master' into dbus-api
authorStef Walter <stef@memberwebs.com>
Thu, 23 Jul 2009 20:02:16 +0000 (20:02 +0000)
committerStef Walter <stef@memberwebs.com>
Thu, 23 Jul 2009 20:02:16 +0000 (20:02 +0000)
Conflicts:
pkcs11/gck/gck-module.c
pkcs11/pkcs11g.h


Trivial merge
Domain: Security / Uncategorized;