projects / platform / upstream / folks.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2afe746 a8bbc54)
Merge remote branch 'pwith/build-cleanup'
authorTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 14 Jul 2010 23:32:52 +0000 (16:32 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 14 Jul 2010 23:32:52 +0000 (16:32 -0700)
commit48f4a582df72796a8e526b45446a8f56814dbd20
tree2cb0b97aa23244c98186e2f953ce371ef2d37574tree | snapshot
parent2afe7462f22547d670d6578466f6e8f334962e78commit | diff
parenta8bbc549554350701901dc0dfc9009b6517f994bcommit | diff
Merge remote branch 'pwith/build-cleanup'

Performed quite a modifications to this branch, as it wasn't rebased on top of
the latest build changes (which also made "make distclean" work for the first
time).

Conflicts:
backends/telepathy/Makefile.am
configure.ac
backends/telepathy/Makefile.am diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
docs/Makefile.am diff1 | diff2 | blob | history
folks/Makefile.am diff1 | diff2 | blob | history
Domain: Multimedia / Uncategorized;