Merge authors: Jacek Sieka (arnetheduck) ------------------------------------------------------------ revno: 2403 [merge] committer: Jacek Sieka <[email protected]> branch nick: dcplusplus timestamp: Sat 2011-01-29 15:15:43 +0100 message: Merge some experimental stuff modified: changelog.txt dcpp/AdcHub.cpp dcpp/BufferedSocket.h dcpp/Client.cpp dcpp/Client.h dcpp/ClientManager.cpp dcpp/ClientManager.h dcpp/ConnectionManager.cpp dcpp/ConnectionManager.h dcpp/CriticalSection.h dcpp/CryptoManager.cpp dcpp/CryptoManager.h dcpp/FavoriteManager.cpp dcpp/FinishedManager.cpp dcpp/FinishedManager.h dcpp/HttpConnection.cpp dcpp/NmdcHub.cpp dcpp/SSL.cpp dcpp/SSL.h dcpp/SSLSocket.cpp dcpp/SSLSocket.h dcpp/Socket.h dcpp/User.cpp dcpp/User.h dcpp/UserConnection.h dcpp/Util.cpp dcpp/Util.h dcpp/WindowManager.cpp dcpp/WindowManager.h dwt/include/dwt/aspects/AspectContainer.h dwt/src/widgets/Grid.cpp win32/FinishedFrameBase.h win32/MainWindow.cpp win32/SearchFrame.cpp win32/UserInfoBase.cpp win32/UsersFrame.cpp win32/UsersFrame.h win32/WinUtil.cpp win32/WinUtil.h The size of the diff (1723 lines) is larger than your specified limit of 1000 lines
-- lp:dcplusplus https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk Your team Dcplusplus-team is subscribed to branch lp:dcplusplus. To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~linuxdcpp-team Post to : [email protected] Unsubscribe : https://launchpad.net/~linuxdcpp-team More help : https://help.launchpad.net/ListHelp

