Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-06-18 | Merge branch 'swift-1.x' | Remko Tronçon | |
* 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 | |||
2011-06-18 | Moving unused server code out of Swiften into Limber. | Remko Tronçon | |