Skip to content

Commit

Permalink
Merge branch 'develop' into feature/torii-async-connection
Browse files Browse the repository at this point in the history
  • Loading branch information
motxx committed Jul 12, 2017
2 parents c92217c + be1de02 commit 0741f37
Show file tree
Hide file tree
Showing 36 changed files with 312 additions and 937 deletions.
5 changes: 1 addition & 4 deletions irohad/ametsuchi/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
add_library(ametsuchi
command_executor_stub.cpp
temporary_wsv_stub.cpp
mutable_storage_stub.cpp
ametsuchi_stub.cpp
impl/storage_impl.cpp
)

target_link_libraries(ametsuchi
Expand Down
100 changes: 0 additions & 100 deletions irohad/ametsuchi/ametsuchi_stub.cpp

This file was deleted.

55 changes: 0 additions & 55 deletions irohad/ametsuchi/ametsuchi_stub.hpp

This file was deleted.

43 changes: 0 additions & 43 deletions irohad/ametsuchi/command_executor_stub.cpp

This file was deleted.

135 changes: 0 additions & 135 deletions irohad/ametsuchi/impl/ametsuchi.cpp

This file was deleted.

Loading

0 comments on commit 0741f37

Please sign in to comment.