Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Fri, 8 Apr 2011 16:21:53 +0000 (18:21 +0200)
committerStef Walter <stefw@collabora.co.uk>
Fri, 8 Apr 2011 16:21:53 +0000 (18:21 +0200)
commit754dc2fb82903d2f45bebf1837784931bc43b609
tree9065528f0150b825cffc460530db0888e6c71a33
parent59744d50022b332cb0435eef1dc687987fff2acc
parent523ad417fbc175c5543f46c4ad0e4f42699af200
Merge branch 'gnome-3-0'

Conflicts:
.gitignore
gcr/gcr-certificate-renderer.c
gcr/gcr-parser.c
gcr/tests/Makefile.am
gcr/tests/frob-key.c
gcr/tests/frob-selector.c
gcr/tests/test-certificate-chain.c
gcr/tests/ui-test-key.c
12 files changed:
docs/reference/gcr/gcr-sections.txt
gcr/gcr-certificate-renderer.c
gcr/gcr-certificate-renderer.h
gcr/gcr-certificate.c
gcr/gcr-certificate.h
gcr/gcr-key-renderer.c
gcr/gcr-library.c
gcr/gcr-pkcs11-certificate.c
gcr/gcr-renderer.c
gcr/gcr-renderer.h
gcr/gcr-simple-certificate.c
gcr/tests/Makefile.am