projects / platform / upstream / gcr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74efd54 43f8ea7)
Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Thu, 21 Apr 2011 07:37:58 +0000 (09:37 +0200)
committerStef Walter <stefw@collabora.co.uk>
Thu, 21 Apr 2011 07:37:58 +0000 (09:37 +0200)
1  2 
gcr/tests/Makefile.am patch | diff1 | diff2 | blob | history
gcr/tests/frob-certificate.c patch | diff1 | diff2 | blob | history

diff --cc gcr/tests/Makefile.am
Simple merge
diff --cc gcr/tests/frob-certificate.c
Simple merge
Domain: Security / Uncategorized;