diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-03-11 01:17:00 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-03-11 01:17:00 +0100 |
| commit | d679ad1c49eeb28be2ac3a75bd7fd1a9be24d483 (patch) | |
| tree | 1e2d95420043f8a1f705f754dfcaf79409ec9294 /src/client | |
| parent | ba05e3e351f17f1dd70676e1ac27fa76003a20ce (diff) | |
| parent | 366a22985b946b70252ba5e6dc291dbfe8addd94 (diff) | |
Merge branch '1.5'
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/QXmppPubSubManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp index de7a9db0..a8334d97 100644 --- a/src/client/QXmppPubSubManager.cpp +++ b/src/client/QXmppPubSubManager.cpp @@ -9,8 +9,8 @@ #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppPubSubAffiliation.h" -#include "QXmppPubSubEventHandler.h" #include "QXmppPubSubBaseItem.h" +#include "QXmppPubSubEventHandler.h" #include "QXmppPubSubSubscribeOptions.h" #include "QXmppPubSubSubscription.h" #include "QXmppStanza.h" |