Skip to content

Commit 13b8451

Browse files
alphagoccalphagocc
committed
Merge branch 'refactor-html'
2 parents 7084921 + 331307b commit 13b8451

5 files changed

Lines changed: 128 additions & 118 deletions

File tree

‎assets/js/jquery.slim.min.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎makespec/BUILDVERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
200
1+
201

‎resource.qrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,7 @@
4343
<file alias="system-help.svg">assets/pics/system-help.svg</file>
4444
<file alias="acrobat.svg">assets/pics/acrobat.svg</file>
4545
</qresource>
46+
<qresource prefix="/js">
47+
<file alias="jquery.slim.min.js">assets/js/jquery.slim.min.js</file>
48+
</qresource>
4649
</RCC>

‎src/base/LemonType.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ enum ResultState {
3232
Skipped,
3333
InteractorError,
3434
PresentationError,
35-
OutputLimitExceeded
35+
OutputLimitExceeded,
36+
LastResultState
3637
};
3738

3839
#include <QList>

0 commit comments

Comments
 (0)