Christian Decker 70bbc46304 Un-break master after merging #389 ... The #389 introduced some changes that conflicted with 9de3827199 so this ports those changes into #389 and fixes the `master` branch again. Lesson learned: always rebase a PR before merging. Signed-off-by: Christian Decker <decker.christian@gmail.com>		2017-12-02 13:00:29 +01:00
..
test	channeld: return htlc from channel_add_htlc and channel_fail_htlc.	2017-12-02 12:54:12 +01:00
Makefile	Un-break master after merging #389	2017-12-02 13:00:29 +01:00
channel.c	Un-break master after merging #389	2017-12-02 13:00:29 +01:00
channel_wire.csv	channeld: generate error messages instead of having master do it.	2017-12-02 12:54:12 +01:00
channeld_htlc.h	channeld: save shared secret for incoming htlc when it comes in.	2017-12-02 12:54:12 +01:00
commit_tx.c	feerate: use u32 everywhere.	2017-11-23 12:40:32 +01:00
commit_tx.h	feerate: use u32 everywhere.	2017-11-23 12:40:32 +01:00
full_channel.c	channeld: save shared secret for incoming htlc when it comes in.	2017-12-02 12:54:12 +01:00
full_channel.h	channeld: return htlc from channel_add_htlc and channel_fail_htlc.	2017-12-02 12:54:12 +01:00