diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-31 11:12:24 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-31 11:12:24 +0100 |
| commit | ffaf494475fa3720f48af8d9771f7b0f5b3c1993 (patch) | |
| tree | 397a6198e42ad788c1eb76f1508094c5db125cc4 /tools | |
| parent | 6b3e4bf46765578e2f5550a0872dc56b58f561ce (diff) | |
| parent | 84f63e56bbc5f32c418d8112b32574f62588b000 (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
telepathy-glib/abi.am
telepathy-glib/base-client.c
telepathy-glib/base-connection.c
telepathy-glib/codegen.am
telepathy-glib/contact.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lcov.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/lcov.am b/tools/lcov.am index 7384f1b99..80023cb78 100644 --- a/tools/lcov.am +++ b/tools/lcov.am @@ -8,6 +8,7 @@ lcov-report: --remove @top_builddir@/lcov.info.tmp telepathy-glib-scan.c rm @top_builddir@/lcov.info.tmp $(mkdir_p) @top_builddir@/lcov.html + echo "Coming soon!" > @top_builddir@/lcov.html/index.html git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\ genhtml --title "@PACKAGE_STRING@ $$git_commit" \ --output-directory @top_builddir@/lcov.html lcov.info |