BitShares/bitshares_toolkit — pull request #73 by valzav (2014-05-15 22:32:34+00:00)
Title: bts_xt_gui

I expect there would be 2 conflicting files:
1. rpc_server.cpp - should be easily resolved.
2. libraries/fc - please ignore it in my pull request if this possible, I've deleted it in my repository and now I cannot get it back to an initial one. Plese let me know If it's not easy to exclude this particular update from my pull request - I'll fix it on my side and resubmit request.

More info about bts_xt_gui can be found here programs/bts_xt/bts_xt_gui/README.txt

Thank you.