Merge authors:
  Rick Stovall (fpstovall)
Related merge proposals:
  https://code.launchpad.net/~fpstovall/nrtb/IPC_common_lib/+merge/87071
  proposed by: Rick Stovall (fpstovall)
  review: Approve - Rick Stovall (fpstovall)
------------------------------------------------------------
revno: 9 [merge]
committer: [email protected]
branch nick: alpha-merge
timestamp: Sun 2012-01-01 17:17:35 -0500
message:
  Merged the IPC common classes for the sim to db ICP channel.
removed:
  bin/plugins/
added:
  Makefile
  common/comm_handlers/
  common/comm_handlers/Makefile
  common/comm_handlers/ack_nak/
  common/comm_handlers/ack_nak/Makefile
  common/comm_handlers/ack_nak/ack_nak.cpp
  common/comm_handlers/ack_nak/ack_nak.h
  common/comm_handlers/ack_nak/ack_nak_test.cpp
  common/comm_handlers/include/
  common/comm_handlers/lib/
  common/comm_handlers/location_data/
  common/comm_handlers/location_data/Makefile
  common/comm_handlers/location_data/location_data.cpp
  common/comm_handlers/location_data/location_data.h
  common/comm_handlers/location_data/location_data_test.cpp
  common/comm_handlers/obj/
  common/comm_handlers/obj_setup_info/
  common/comm_handlers/obj_setup_info/Makefile
  common/comm_handlers/obj_setup_info/obj_setup_info.cpp
  common/comm_handlers/obj_setup_info/obj_setup_info.h
  common/comm_handlers/obj_setup_info/obj_setup_info_test.cpp
  common/comm_handlers/sim_db_wrapper/
  common/comm_handlers/sim_db_wrapper/Makefile
  common/comm_handlers/sim_db_wrapper/sim_db_wrapper.cpp
  common/comm_handlers/sim_db_wrapper/sim_db_wrapper.h
  common/comm_handlers/sim_db_wrapper/sim_db_wrapper_test.cpp
  common/comm_handlers/sim_info/
  common/comm_handlers/sim_info/Makefile
  common/comm_handlers/sim_info/sim_setup_info.cpp
  common/comm_handlers/sim_info/sim_setup_info.h
  common/comm_handlers/sim_info/sim_setup_info_test.cpp
  common/comm_handlers/sim_stop/
  common/comm_handlers/sim_stop/Makefile
  common/comm_handlers/sim_stop/sim_stop.cpp
  common/comm_handlers/sim_stop/sim_stop.h
  common/comm_handlers/sim_stop/sim_stop_test.cpp
  common/comm_handlers/sim_termination/
  common/comm_handlers/sim_termination/Makefile
  common/comm_handlers/sim_termination/sim_termination.cpp
  common/comm_handlers/sim_termination/sim_termination.h
  common/comm_handlers/sim_termination/sim_termination_test.cpp
  common/comm_handlers/tq_obj_data/
  common/comm_handlers/tq_obj_data/Makefile
  common/comm_handlers/tq_obj_data/tq_obj.cpp
  common/comm_handlers/tq_obj_data/tq_obj.h
  common/comm_handlers/tq_obj_data/tq_obj_test.cpp
  common/comm_handlers/tq_update/
  common/comm_handlers/tq_update/Makefile
  common/comm_handlers/tq_update/tq_update.cpp
  common/comm_handlers/tq_update/tq_update.h
  common/comm_handlers/tq_update/tq_update_test.cpp
  common/comm_handlers/triplet/
  common/comm_handlers/triplet/Makefile
  common/comm_handlers/triplet/triplet.cpp
  common/comm_handlers/triplet/triplet.h
  common/comm_handlers/triplet/triplet_test.cpp
  common/comm_handlers/velocity_data/
  common/comm_handlers/velocity_data/Makefile
  common/comm_handlers/velocity_data/velocity_data.cpp
  common/comm_handlers/velocity_data/velocity_data.h
  common/comm_handlers/velocity_data/velocity_data_test.cpp
  sim_engine/Makefile
  sim_engine/comm_manager/
  sim_engine/comm_manager/Makefile
  sim_engine/comm_manager/in_processor/
  sim_engine/comm_manager/manager/
  sim_engine/comm_manager/manager/Makefile
  sim_engine/comm_manager/manager/sim_db_channel.cpp
  sim_engine/comm_manager/manager/sim_db_channel.h
  sim_engine/comm_manager/out_processor/
  sim_engine/obj/
  sim_engine/test/
  sim_engine/test/fake_simengine/
renamed:
  sim_engine/physics/point_mass/ => sim_engine/physics/rigid_body/
modified:
  GPB_proto/ack_nak.proto
  GPB_proto/sim_management.proto
  GPB_proto/sim_obj_tq_update.proto
  GPB_proto/vis_get_listing.proto
  GPB_proto/vis_management.proto
  README
  common/Makefile
The size of the diff (3660 lines) is larger than your specified limit of 1000 
lines

--
lp:nrtb
https://code.launchpad.net/~nrtb-core/nrtb/alpha

Your team NRTB Core is subscribed to branch lp:nrtb.
To unsubscribe from this branch go to 
https://code.launchpad.net/~nrtb-core/nrtb/alpha/+edit-subscription

_______________________________________________
Mailing list: https://launchpad.net/~nrtb-core
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~nrtb-core
More help   : https://help.launchpad.net/ListHelp

Reply via email to