Merge lp:~zorba-coders/zorba/windows-hashmap-workaround into lp:zorba
Proposed by
Chris Hillery
Status: | Merged |
---|---|
Approved by: | Rodolfo Ochoa |
Approved revision: | 11113 |
Merged at revision: | 11119 |
Proposed branch: | lp:~zorba-coders/zorba/windows-hashmap-workaround |
Merge into: | lp:zorba |
Diff against target: |
24 lines (+2/-2) 2 files modified
src/unit_tests/CMakeLists.txt (+1/-1) src/unit_tests/unit_tests.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/windows-hashmap-workaround |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rodolfo Ochoa | Approve | ||
Chris Hillery | Approve | ||
Review via email: mp+131716@code.launchpad.net |
Commit message
Temporarily disabling a test program that causes Windows compilation errors.
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ windows- hashmap- workaround- 2012-10- 27T01-57- 37.438Z/ log.html
Log at: http://