Merge authors: Rick Stovall <fpstovall> Related merge proposals: https://code.launchpad.net/~fpstovall/nrtb/bk2thefuture/+merge/179547 proposed by: Rick Stovall (fpstovall) review: Approve - Rick Stovall (fpstovall) ------------------------------------------------------------ revno: 15 [merge] committer: Rick Stovall <fpstovall> branch nick: alpha timestamp: Sun 2013-08-11 19:25:57 -0400 message: Merged bk2thefuture branch, moving our main development effort back to C++ and providing a ready to use set of common libs suitable for the alpha development. removed: obsolete/Cpp/common/logger/log_setup.cpp obsolete/Cpp/common/logger/log_setup.h obsolete/Cpp/common/logger/log_test.cpp added: cpp/common/abs_queue/ cpp/common/abs_queue/Makefile cpp/common/abs_queue/abs_queue.h cpp/common/abs_queue/abs_queue_test.cpp cpp/common/logger/logger.cpp cpp/common/logger/logger.h cpp/common/logger/logger_test.cpp cpp/common/timer/ cpp/common/timer/Makefile cpp/common/timer/hires_timer.cpp cpp/common/timer/hires_timer.h cpp/common/timer/timer_test.cpp obsolete/cpp/ renamed: D_lang/ => obsolete/D_lang/ obsolete/Cpp/ => cpp/ obsolete/Cpp/common/GPB/ => obsolete/cpp/GPB/ obsolete/Cpp/common/comm_handlers/ => obsolete/cpp/comm_handlers/ obsolete/Cpp/common/threads/ => obsolete/cpp/threads/ obsolete/Cpp/common/timer/ => obsolete/cpp/timer/ obsolete/Cpp/common/transceiver/ => obsolete/cpp/transceiver/ modified: cpp/common/Makefile cpp/common/circular_queue/Makefile cpp/common/circular_queue/circular_queue.h cpp/common/circular_queue/circular_queue_test.cpp cpp/common/common_rl/Makefile cpp/common/common_rl/common.cpp cpp/common/common_rl/common.h cpp/common/common_rl/common_rl_test.cpp cpp/common/confreader/Makefile cpp/common/confreader/confreader.cpp cpp/common/confreader/confreader.h cpp/common/confreader/conftest.cpp cpp/common/linear_queue/Makefile cpp/common/linear_queue/linear_queue.h cpp/common/linear_queue/linear_queue_test.cpp cpp/common/logger/Makefile cpp/common/point/Makefile cpp/common/point/common_test.cpp cpp/common/point/triad.h cpp/common/serializer/Makefile cpp/common/serializer/serializer.cpp cpp/common/serializer/serializer.h cpp/common/singleton/Makefile cpp/common/singleton/singleton.h cpp/common/singleton/singleton_test.cpp cpp/common/sockets/Makefile cpp/common/sockets/base_socket.cpp cpp/common/sockets/base_socket.h cpp/common/sockets/socket_test.cpp The size of the diff (7287 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
