Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:34:41 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 10:41:11 (GMT) |
| commit | 362b2d147e4050e997104c24b2ed2e818adab5ed (patch) | |
| tree | 63340cf49072e2cc0d9d876859249eb22fd540d3 /Slimber/Server.h | |
| parent | 0328d98d29b383ecfcb5ffb66df0a9b7b4d85654 (diff) | |
| parent | 7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (diff) | |
| download | swift-362b2d147e4050e997104c24b2ed2e818adab5ed.zip swift-362b2d147e4050e997104c24b2ed2e818adab5ed.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Moving unused server code out of Swiften into Limber.
Conflicts:
Limber/Server/ServerFromClientSession.cpp
Limber/Server/ServerSession.cpp
Limber/Server/ServerStanzaRouter.cpp
Limber/Server/SimpleUserRegistry.cpp
Limber/Server/SimpleUserRegistry.h
Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
Limber/Server/UserRegistry.cpp
Limber/main.cpp
Slimber/Server.cpp
Slimber/Server.h
Diffstat (limited to 'Slimber/Server.h')
| -rw-r--r-- | Slimber/Server.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Slimber/Server.h b/Slimber/Server.h index 386365b..58b1e7c 100644 --- a/Slimber/Server.h +++ b/Slimber/Server.h @@ -10,15 +10,15 @@ #include <boost/optional.hpp> #include <vector> -#include <Swiften/Network/BoostIOServiceThread.h> -#include <Swiften/Network/BoostConnectionServer.h> -#include <Swiften/Server/UserRegistry.h> -#include <Swiften/Base/IDGenerator.h> -#include <Swiften/Server/ServerFromClientSession.h> -#include <Swiften/JID/JID.h> -#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h> -#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> -#include <Swiften/LinkLocal/LinkLocalServiceInfo.h> +#include "Swiften/Network/BoostIOServiceThread.h" +#include "Swiften/Network/BoostConnectionServer.h" +#include "Limber/Server/UserRegistry.h" +#include "Swiften/Base/IDGenerator.h" +#include "Limber/Server/ServerFromClientSession.h" +#include "Swiften/JID/JID.h" +#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h" +#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h" +#include "Swiften/LinkLocal/LinkLocalServiceInfo.h" #include "Slimber/ServerError.h" namespace Swift { |