projects / platform / upstream / folks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f69f90d c6e5052)
Merge branch 'bgo628970-expose-backends3'
authorTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 15 Sep 2010 15:13:50 +0000 (08:13 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 15 Sep 2010 15:13:50 +0000 (08:13 -0700)
1  2 
folks/backend-store.vala patch | diff1 | diff2 | blob | history
folks/individual-aggregator.vala patch | diff1 | diff2 | blob | history

diff --cc folks/backend-store.vala
Simple merge
diff --cc folks/individual-aggregator.vala
Simple merge
Domain: Multimedia / Uncategorized;