dee

Merge lp:~ken-vandine/dee/1.2.7+13.10.20130924.1-0ubuntu2 into lp:dee

Proposed by Ken VanDine
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 433
Merged at revision: 433
Proposed branch: lp:~ken-vandine/dee/1.2.7+13.10.20130924.1-0ubuntu2
Merge into: lp:dee
Diff against target: 11 lines (+1/-1)
1 file modified
build/autotools/gcov.m4 (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/dee/1.2.7+13.10.20130924.1-0ubuntu2
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Bruce Park (community) Approve
Review via email: mp+200719@code.launchpad.net

Commit message

Sync changes uploaded to the archive back to trunk

Description of the change

Sync changes uploaded to the archive back to trunk

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
433. By Ken VanDine

updated lcov versions in gcov.m4

Revision history for this message
Robert Bruce Park (robru) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/autotools/gcov.m4'
2--- build/autotools/gcov.m4 2012-12-11 23:05:18 +0000
3+++ build/autotools/gcov.m4 2014-01-08 18:27:14 +0000
4@@ -33,7 +33,7 @@
5 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
6 fi
7
8- lcov_version_list="1.6 1.7 1.8 1.9"
9+ lcov_version_list="1.6 1.7 1.8 1.9 1.10"
10 AC_CHECK_PROG(LCOV, lcov, lcov)
11 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
12

Subscribers

People subscribed via source and target branches

to all changes: