diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-10-11 16:06:53 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-10-11 16:06:53 +0200 |
| commit | 2036d7d5e028c08b022390d607a2ead188e7cc90 (patch) | |
| tree | a527c6409927189d1a5d126ac1576eab7e93caf5 /result/stringresult.h | |
| parent | 84691771b54365160f5b1d54033e00187dbbf043 (diff) | |
| parent | 29f0126a7b8ae3479597252f5056d5e67b6ed10d (diff) | |
| download | OneRoll-2036d7d5e028c08b022390d607a2ead188e7cc90.tar.gz OneRoll-2036d7d5e028c08b022390d607a2ead188e7cc90.zip | |
Merge branch 'rangeInList'
resolved conflicts and merge rangeInList in master.
Conflicts:
HelpMe.md
diceparser.cpp
parsingtoolbox.cpp
result/result.cpp
result/stringresult.h
Diffstat (limited to 'result/stringresult.h')
| -rw-r--r-- | result/stringresult.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/result/stringresult.h b/result/stringresult.h index 6819aaa..cdd7de2 100644 --- a/result/stringresult.h +++ b/result/stringresult.h @@ -36,7 +36,7 @@ public: * @brief toString * @return */ - virtual QString toString(); + virtual QString toString(bool); virtual void setHighLight(bool ); virtual bool hasHighLight() const; |