You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Philipp Balzarek
5cf70fa7e2
Merge remote-tracking branch 'nejla/master'
Conflicts:
pontarius-xmpp.cabal
source/Network/Xmpp/Basic.hs
source/Network/Xmpp/Concurrent/Channels/Types.hs
source/Network/Xmpp/Connection.hs
source/Network/Xmpp/Errors.hs
source/Network/Xmpp/Marshal.hs
source/Network/Xmpp/Pickle.hs
source/Network/Xmpp/Session.hs
source/Network/Xmpp/Stream.hs
source/Network/Xmpp/Tls.hs
source/Network/Xmpp/Types.hs
source/Network/Xmpp/Xep/InbandRegistration.hs
|
13 years ago |
| .. |
|
Types.hs
|
Remove Context
|
13 years ago |