Skip to content

Commit

Permalink
Catch up
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtemGr committed Jul 14, 2019
2 parents 2769f36 + cb58422 commit e1302cd
Show file tree
Hide file tree
Showing 687 changed files with 761 additions and 272,314 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ set(CMAKE_CXX_EXTENSIONS Off)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
include_directories("${CMAKE_SOURCE_DIR}")
add_subdirectory(iguana/exchanges)
add_subdirectory(crypto777)
add_subdirectory(crypto777/jpeg)
47 changes: 7 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edition = "2018"
[features]
native = [
"hyper", "tokio-core", "dirs",
"common/native", "peers/native", "coins/native", "portfolio/native"
"common/native", "peers/native", "coins/native", # "portfolio/native"
]

[[bin]]
Expand Down Expand Up @@ -70,7 +70,9 @@ libc = "0.2"
num-traits = "0.2"
rpc = { git = "https://github.com/artemii235/parity-bitcoin.git" }
peers = { path = "mm2src/peers" }
portfolio = { path = "mm2src/portfolio" }
# AP: portfolio RPCs are not documented and not used as of now
# so the crate is disabled to speed up the entire removal of C code
# portfolio = { path = "mm2src/portfolio" }
primitives = { git = "https://github.com/artemii235/parity-bitcoin.git" }
rand = { version = "0.7", features = ["std", "small_rng"] }
regex = "1"
Expand Down
43 changes: 0 additions & 43 deletions OSlibs/android/Android_Readme.md

This file was deleted.

Loading

0 comments on commit e1302cd

Please sign in to comment.