Not a subject for review
authorVladislav Smenyuk <VSmenyuk@luxoft.com>
Tue, 8 Apr 2014 10:54:48 +0000 (03:54 -0700)
committerJustin Dickow <jjdickow@gmail.com>
Wed, 9 Jul 2014 18:10:24 +0000 (14:10 -0400)
commitb5300ff009c3a54c5de01233c3ea2951f42e82af
tree04955a00b3ec1df854834157a828fdbfed848792
parent25d6739f19ca4b066efc0b842693b6c505074688
Not a subject for review

Reason: Local changes

Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Conflicts:
src/appMain/log4cxx.properties
src/appMain/log4cxx.properties
src/components/application_manager/src/application_manager_impl.cc
src/components/protocol_handler/include/protocol_handler/protocol_packet.h
src/components/protocol_handler/src/protocol_handler_impl.cc
src/components/protocol_handler/src/protocol_packet.cc
src/components/protocol_handler/src/protocol_payload.cc
src/components/protocol_handler/src/rpc_type.cc
src/components/protocol_handler/src/service_type.cc