projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0dd8d7 4ca150b)
Merge branch 'master' into jennifer/trp-devel
authorJennifer Richards <jennifer@painless-security.com>
Fri, 9 Sep 2016 18:56:31 +0000 (14:56 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Fri, 9 Sep 2016 18:56:31 +0000 (14:56 -0400)
1  2 
gsscon/gsscon_active.c patch | diff1 | diff2 | blob | history

diff --cc gsscon/gsscon_active.c
Simple merge
Moonshot Trust Router