Zorba

Merge lp:~ceejatec/zorba/http-client-test into lp:zorba/http-client-module

  1. http-client-test
  2. Merge into http-client-module
Proposed by Chris Hillery
Status: Code failed to merge
Proposed branch: lp:~ceejatec/zorba/http-client-test
Merge into: lp:zorba/http-client-module
Diff against target: 12 lines (+2/-0)
1 file modified
CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~ceejatec/zorba/http-client-test
Reviewer Review Type Date Requested Status
Chris Hillery Needs Fixing
Zorba Build Bot Pending
Review via email: mp+169748@code.launchpad.net

Commit message

Breaking http-client things.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Needs Fixing
Reply
Revision history for this message
Chris Hillery (ceejatec) wrote :

{'Needs Fixing': 1, 'Pending': 1}

Reply
lp:~ceejatec/zorba/http-client-test updated
36. By Chris Hillery

Noisy

Unmerged revisions

36. By Chris Hillery

Noisy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-08-04 02:14:22 +0000
3+++ CMakeLists.txt 2013-06-19 08:40:51 +0000
4@@ -18,6 +18,8 @@
5 ENABLE_TESTING ()
6 INCLUDE (CTest)
7
8+MESSAGE (STATUS "Would you like to play a game?")
9+
10 LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
11
12 FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")

Subscribers

People subscribed via source and target branches

to all changes: