Fixed rebase related issues.
authorArmin Novak <armin.novak@thincast.com>
Thu, 25 Aug 2016 07:47:50 +0000 (09:47 +0200)
committerArmin Novak <armin.novak@thincast.com>
Thu, 6 Oct 2016 11:43:11 +0000 (13:43 +0200)
commitf2bb83e28d92659f65901aa697aba950bf47e3da
tree1585323cf92095ce98edef2feec2550aba41b125
parent296bc026dc58b90e9b3930a28c51654053e91fbc
Fixed rebase related issues.
server/shadow/Mac/mac_shadow.c
server/shadow/shadow_client.c
server/shadow/shadow_encoder.c