mira-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Alan Alvarez (clsk)
  Shilpa Sodani (sa-sodani)
  Thurston (tstone2077)
Related merge proposals:
  https://code.launchpad.net/~mira-dev/mira/tmp-dev/+merge/14764
  proposed by: Alan Alvarez (clsk)
  review: Approve - Shilpa Sodani (sa-sodani)
------------------------------------------------------------
revno: 188 [merge]
committer: Alan Alvarez <aalvarez@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-11-24 19:45:43 -0600
message:
  Merging Development Branch
removed:
  mira-server/include/network/messages/MsgUserAccepted.h
added:
  mira-client/include/gui/qt/ContactTreeWidgetItem.h
  mira-client/include/gui/qt/LoginDialog.h
  mira-client/include/gui/qt/NavigationTreeWidgetItem.h
  mira-client/include/network/messages/
  mira-client/include/network/messages/MsgError.h
  mira-client/include/network/messages/MsgLoginSuccessful.h
  mira-client/include/network/messages/MsgUserAccepted.h
  mira-client/include/tools.h
  mira-client/resources/images/cancel.png
  mira-client/resources/images/transmit_blue.png
  mira-client/src/gui/qt/ContactTreeWidgetItem.cpp
  mira-client/src/gui/qt/LoginDialog.cpp
  mira-client/src/gui/qt/NavigationTreeWidgetItem.cpp
  mira-server/include/network/messages/MsgError.h
  mira-server/include/network/messages/MsgJoinGroup.h
  mira-server/include/network/messages/MsgLogin.h
  mira-server/include/network/messages/MsgMessage.h
  mira-server/include/network/messages/MsgNewGroup.h
  mira-server/include/network/messages/MsgPing.h
  mira-server/include/network/messages/MsgPong.h
  mira-server/include/network/messages/MsgPrivateMessage.h
  mira-server/include/network/messages/MsgQuery.h
  mira-server/src/network/messages/
  mira-server/src/network/messages/MsgQuery.cpp
renamed:
  mira-client/include/gui/qt/MiraApplication.h => mira-client/include/gui/qt/GuiApp.h
  mira-client/src/gui/qt/MiraApplication.cpp => mira-client/src/gui/qt/GuiApp.cpp
modified:
  mira-client/CMakeLists.txt
  mira-client/CompilerOptions.cmake.in
  mira-client/include/Application.h
  mira-client/include/User.h
  mira-client/include/gui/qt/ChatDockWidget.h
  mira-client/include/gui/qt/MainWindow.h
  mira-client/include/gui/qt/NavigationDockWidget.h
  mira-client/include/gui/qt/Utility.h
  mira-client/include/gui/qt/Workplace.h
  mira-client/include/gui/qt/WorkplaceWidget.h
  mira-client/include/network/Client.h
  mira-client/include/network/Msg.h
  mira-client/include/network/asio/AsioClient.h
  mira-client/resources/Resources.qrc
  mira-client/resources/images/install-icon.png*
  mira-client/resources/images/install-left-side.png*
  mira-client/resources/images/loading-splash.png*
  mira-client/src/Application.cpp
  mira-client/src/gui/qt/ChatDockWidget.cpp
  mira-client/src/gui/qt/ContactDockWidget.cpp
  mira-client/src/gui/qt/MainWindow.cpp
  mira-client/src/gui/qt/NavigationDockWidget.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/conf/mira.conf
  mira-server/include/Resource.h
  mira-server/include/WorkPlace.h
  mira-server/include/field_defs.h
  mira-server/include/network/Msg.h
  mira-server/include/network/TcpConnection.h
  mira-server/include/network/messages/MsgNewUser.h
  mira-server/include/tools.h
  mira-server/src/main.cpp
  mira-server/src/network/Msg.cpp
  mira-server/src/network/TcpConnection.cpp
  mira-client/include/gui/qt/GuiApp.h
  mira-client/src/gui/qt/GuiApp.cpp
The size of the diff (4786 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.