mergify[bot] a97feedcc1 Pull program stubs into SDK (bp #10704) (#10713) ...

* Pull program stubs into SDK (#10704)

(cherry picked from commit d77818c18b)

# Conflicts:
#	programs/bpf/Cargo.lock
#	programs/bpf/rust/128bit/Cargo.toml
#	programs/bpf/rust/128bit_dep/Cargo.toml
#	programs/bpf/rust/alloc/Cargo.toml
#	programs/bpf/rust/dep_crate/Cargo.toml
#	programs/bpf/rust/dup_accounts/Cargo.toml
#	programs/bpf/rust/error_handling/Cargo.toml
#	programs/bpf/rust/external_spend/Cargo.toml
#	programs/bpf/rust/invoke/Cargo.toml
#	programs/bpf/rust/invoked/Cargo.toml
#	programs/bpf/rust/iter/Cargo.toml
#	programs/bpf/rust/many_args/Cargo.toml
#	programs/bpf/rust/many_args_dep/Cargo.toml
#	programs/bpf/rust/noop/Cargo.toml
#	programs/bpf/rust/panic/Cargo.toml
#	programs/bpf/rust/param_passing/Cargo.toml
#	programs/bpf/rust/param_passing_dep/Cargo.toml
#	programs/bpf/rust/sysval/Cargo.toml
#	sdk/bpf/rust/test/Cargo.toml

* fix conflicts

Co-authored-by: Jack May <jack@solana.com>

2020-07-01 20:17:37 +00:00

..

benches

Make slot history a billion times faster (#10175)

2020-05-22 11:15:16 -07:00

bpf

Pull program stubs into SDK (bp #10704) (#10713)

2020-07-01 20:17:37 +00:00

docker-solana

Re-enable move in docker-solana (#10214) (#10228)

2020-05-25 01:32:54 -07:00

macro

Update cargo.* version to 1.2.9 (#10861)

2020-06-30 23:21:10 +00:00

src

Pull program stubs into SDK (bp #10704) (#10713)

2020-07-01 20:17:37 +00:00

.gitignore

tmp dirs target to farf (#5079)

2019-07-12 18:28:42 -07:00

Cargo.toml

Update cargo.* version to 1.2.9 (#10861)

2020-06-30 23:21:10 +00:00