Commit Graph

6 Commits

Author SHA1 Message Date
stonedDiscord
4a2a167f7d Merge branch 'master' into 'bass-optional'
# Conflicts:
#   Attorney_Online.pro
#   include/aoapplication.h
2019-07-20 16:20:05 +00:00
David Skoland
5eccabcad1 Less insane debugging; minor refactoring (!75) 2019-07-12 23:00:25 +00:00
stonedDiscord
6e93d6e1be discord optional v2 2019-03-12 19:30:03 +01:00
stonedDiscord
92c54ba2eb Revert "make discord optional"
This reverts commit 744c100159.
2019-03-12 19:27:13 +01:00
stonedDiscord
744c100159 make discord optional 2019-03-12 00:27:11 +01:00
David Skoland
00cfd2750d moved headers into include and cpp files into src + logo into resource 2018-12-26 16:43:08 +01:00