projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b053e7d 9621108)
Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router
authorSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
Pull in two additional fixes from Adam.

1  2 
tid/example/tids_main.c patch | diff1 | diff2 | blob | history
tr/tr_main.c patch | diff1 | diff2 | blob | history

diff --cc tid/example/tids_main.c
Simple merge
diff --cc tr/tr_main.c
Simple merge
Moonshot Trust Router