mira-dev team mailing list archive

Thread
Date
[Branch ~mira-dev/mira/trunk] Rev 192: Merged mira-utilities branch

To: Mira Core Development Team <mira-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 22 Apr 2010 14:33:29 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
Merge authors:
  Alan Alvarez (clsk)
  Thurston (tstone2077)
------------------------------------------------------------
revno: 192 [merge]
committer: Alan Alvarez <aalvarez@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-04-22 10:15:40 -0400
message:
  Merged mira-utilities branch
removed:
  mira-client/include/gui/qt/Utility.h
  mira-client/resources/images/utility-files.png
  mira-client/src/gui/qt/Utility.cpp
added:
  mira-client/include/Settings.h
  mira-client/include/gui/qt/WorkplaceDialog.h
  mira-client/include/gui/qt/WorkplaceMember.h
  mira-client/include/network/messages/MsgGroupAccepted.h
  mira-client/include/network/messages/MsgGroupJoined.h
  mira-client/include/network/messages/MsgMembersList.h
  mira-client/include/network/messages/MsgNewMember.h
  mira-client/include/network/messages/MsgPrivateMessage.h
  mira-client/include/network/messages/MsgUserStatus.h
  mira-client/include/network/messages/MsgUtility.h
  mira-client/include/network/messages/MsgUtilityList.h
  mira-client/include/network/messages/MsgWorkplaceDescription.h
  mira-client/include/network/messages/MsgWorkplaceList.h
  mira-client/include/utilities/GuiInterface.h
  mira-client/include/utilities/NetworkInterface.h
  mira-client/include/utilities/UtilityInterface.h
  mira-client/include/utilities/UtilityManager.h
  mira-client/include/utilities/files/
  mira-client/include/utilities/files/FileConnection.h
  mira-client/include/utilities/files/FilesResources.qrc
  mira-client/include/utilities/files/FilesUtility.h
  mira-client/include/utilities/files/WorkplaceFiles.h
  mira-client/include/utilities/files/WorkplaceFilesWidget.h
  mira-client/include/utilities/files/images/
  mira-client/include/utilities/files/images/basket_put.png
  mira-client/include/utilities/files/images/delete.png
  mira-client/include/utilities/files/images/document_48.png
  mira-client/include/utilities/files/images/folder.png
  mira-client/include/utilities/files/images/folder_48.png
  mira-client/include/utilities/files/images/folder_add.png
  mira-client/include/utilities/files/images/page_white_add.png
  mira-client/include/utilities/files/images/utility-files.png
  mira-client/include/utilities/libmira-utility/
  mira-client/include/utilities/libmira-utility/MiraUtility.h
  mira-client/src/gui/qt/WorkplaceDialog.cpp
  mira-client/src/utilities/files/
  mira-client/src/utilities/files/FileConnection.cpp
  mira-client/src/utilities/files/FilesUtility.cpp
  mira-client/src/utilities/files/WorkplaceFiles.cpp
  mira-client/src/utilities/files/WorkplaceFilesWidget.cpp
  mira-client/src/utilities/libmira-utility/
  mira-client/src/utilities/libmira-utility/MiraUtility.cpp
  mira-server/include/network/messages/MsgListMembers.h
  mira-server/include/network/messages/MsgListUtilities.h
  mira-server/include/network/messages/MsgListWorkplaces.h
  mira-server/include/network/messages/MsgUtility.h
  mira-server/include/network/messages/outgoing/
  mira-server/include/network/messages/outgoing/MsgUserStatus.h
  mira-server/include/utilities/UtilityInfo.h
  mira-server/include/utilities/UtilityManager.h
  mira-server/include/utilities/files/
  mira-server/include/utilities/files/FileConnection.h
  mira-server/include/utilities/files/FileServer.h
  mira-server/include/utilities/files/FileUtility.h
  mira-server/include/utilities/files/files.h
  mira-server/include/utilities/libmira-utilty/
  mira-server/include/utilities/libmira-utilty/MiraUtility.h
  mira-server/src/utilities/files/
  mira-server/src/utilities/files/FileConnection.cpp
  mira-server/src/utilities/files/FileServer.cpp
  mira-server/src/utilities/files/FileUtility.cpp
  mira-server/src/utilities/files/files.cpp
  mira-server/src/utilities/libmira-utility/
  mira-server/src/utilities/libmira-utility/MiraUtility.cpp
modified:
  mira-client/CMakeLists.txt
  mira-client/Dependencies.cmake.in
  mira-client/include/Application.h
  mira-client/include/MiraDefs.h
  mira-client/include/User.h
  mira-client/include/gui/qt/ChatDockWidget.h
  mira-client/include/gui/qt/ContactDockWidget.h
  mira-client/include/gui/qt/GuiApp.h
  mira-client/include/gui/qt/MainWindow.h
  mira-client/include/gui/qt/NavigationDockWidget.h
  mira-client/include/gui/qt/NavigationTreeWidgetItem.h
  mira-client/include/gui/qt/Workplace.h
  mira-client/include/gui/qt/WorkplaceWidget.h
  mira-client/include/network/Msg.h
  mira-client/include/network/asio/AsioClient.h
  mira-client/include/network/messages/MsgError.h
  mira-client/include/network/messages/MsgLoginSuccessful.h
  mira-client/resources/Resources.qrc
  mira-client/src/Application.cpp
  mira-client/src/gui/qt/ChatDockWidget.cpp
  mira-client/src/gui/qt/ContactDockWidget.cpp
  mira-client/src/gui/qt/GuiApp.cpp
  mira-client/src/gui/qt/LoginDialog.cpp
  mira-client/src/gui/qt/MainWindow.cpp
  mira-client/src/gui/qt/NavigationDockWidget.cpp
  mira-client/src/gui/qt/Workplace.cpp
  mira-client/src/gui/qt/WorkplaceWidget.cpp
  mira-client/src/gui/qt/main.cpp
  mira-client/src/network/Msg.cpp
  mira-client/src/network/asio/AsioClient.cpp
  mira-server/CMakeLists.txt
  mira-server/CompilerOptions.cmake.in
  mira-server/Dependencies.cmake.in
  mira-server/conf/Directory.xml
  mira-server/include/Application.h
  mira-server/include/Field.h
  mira-server/include/Resource.h
  mira-server/include/WorkPlace.h
  mira-server/include/directory/Directory.h
  mira-server/include/directory/MD5.h
  mira-server/include/directory/plaintext/PlainTextDirectory.h
  mira-server/include/field_defs.h
  mira-server/include/network/Msg.h
  mira-server/include/network/messages/MsgJoinGroup.h
  mira-server/include/network/messages/MsgLogin.h
  mira-server/include/network/messages/MsgNewGroup.h
  mira-server/src/Application.cpp
  mira-server/src/directory/MD5.cpp
  mira-server/src/directory/plaintext/PlainTextDirectory.cpp
  mira-server/src/main.cpp
  mira-server/src/network/Msg.cpp
  mira-server/src/network/TcpConnection.cpp
  mira-server/src/network/messages/MsgQuery.cpp
The size of the diff (7160 lines) is larger than your specified limit of 1000 lines

--
lp:mira
https://code.launchpad.net/~mira-dev/mira/trunk

Your team Mira Core Development Team is subscribed to branch lp:mira.
To unsubscribe from this branch go to https://code.launchpad.net/~mira-dev/mira/trunk/+edit-subscription