diff options
| author | David A Roberts <d@vidr.cc> | 2016-04-12 20:31:20 +1000 |
|---|---|---|
| committer | David A Roberts <d@vidr.cc> | 2016-04-12 20:31:20 +1000 |
| commit | da90b601b06512e23ac66d0b301e1eafaf2b7bc2 (patch) | |
| tree | e9c6ef5f5da2430c259f00077b83d275adc1fb29 /room.h | |
| parent | 0f6cb38896443cf104aa470eb1822bd2e49143f1 (diff) | |
| parent | 00a73167ca455370868f1f82257420f0cb399a15 (diff) | |
| download | libquotient-da90b601b06512e23ac66d0b301e1eafaf2b7bc2.tar.gz libquotient-da90b601b06512e23ac66d0b301e1eafaf2b7bc2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'room.h')
| -rw-r--r-- | room.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -41,7 +41,7 @@ namespace QMatrixClient virtual ~Room(); QString id() const; - QList<Event*> messages() const; + QList<Event*> messageEvents() const; QString name() const; QStringList aliases() const; QString canonicalAlias() const; |