summary refs log tree commit diff
path: root/src/InviteeItem.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-06-09 20:51:36 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-06-09 20:51:36 -0400
commit6bb73f84a3075abe7a1c1fd2d56a259740070c70 (patch)
treeeecb0bc3ec18a04cd226d1caea74b2b65ef6d851 /src/InviteeItem.cpp
parentMinor adjustments to emoji picker (diff)
parentSmooth scaling for images (diff)
downloadnheko-6bb73f84a3075abe7a1c1fd2d56a259740070c70.tar.xz
Merge master and fix conflicts
Diffstat (limited to 'src/InviteeItem.cpp')
-rw-r--r--src/InviteeItem.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/InviteeItem.cpp b/src/InviteeItem.cpp

index 906a3bfe..a6b471dc 100644 --- a/src/InviteeItem.cpp +++ b/src/InviteeItem.cpp
@@ -1,4 +1,5 @@ #include <QHBoxLayout> +#include <QLabel> #include <QPushButton> #include "InviteeItem.h"