Merge authors: Rick Stovall <fpstovall> Related merge proposals: https://code.launchpad.net/~fpstovall/nrtb/fps-sprint-003/+merge/195485 proposed by: Rick Stovall (fpstovall) review: Approve - Rick Stovall (fpstovall) ------------------------------------------------------------ revno: 16 [merge] committer: Rick Stovall <fpstovall> branch nick: alpha timestamp: Sat 2013-11-16 16:09:50 -0500 message: Merging sprint-003. some refactoring, a couple bug fixes, and the interthread communications modules. removed: cpp/sim_engine/physics/ cpp/sim_engine/physics/Makefile cpp/sim_engine/physics/abstract_effector/ cpp/sim_engine/physics/include/ cpp/sim_engine/physics/obj/ cpp/sim_engine/physics/rigid_body/ added: cpp/Makefile cpp/common/ipc_channel/ cpp/common/ipc_channel/Makefile cpp/common/ipc_channel/ipc_channel.cpp cpp/common/ipc_channel/ipc_channel.h cpp/common/ipc_channel/ipc_channel_test.cpp cpp/sim_engine/control_interface/ cpp/sim_engine/control_interface/Makefile cpp/sim_engine/control_interface/control_interface.cpp cpp/sim_engine/control_interface/control_interface.h cpp/sim_engine/control_interface/control_interface_test.cpp cpp/sim_engine/main/ cpp/sim_engine/main/Makefile cpp/sim_engine/main/simengine.cpp cpp/sim_engine/messages/ cpp/sim_engine/messages/Makefile cpp/sim_engine/messages/messages.cpp cpp/sim_engine/messages/messages.h cpp/sim_engine/messages/messages_test.cpp modified: Makefile cpp/common/Makefile cpp/common/abs_queue/abs_queue.h cpp/common/circular_queue/circular_queue.h cpp/common/sockets/base_socket.cpp cpp/common/sockets/base_socket.h cpp/sim_engine/Makefile The size of the diff (1217 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
