Commit Graph

8 Commits

Author SHA1 Message Date
oldmud0
e0c49ceb07 Merge branch 'bass-optional' into 'master'
Bass+discord optional

See merge request AttorneyOnline/AO2-Client!59
2019-07-20 16:57:27 +00:00
cents02
82db3e2263 Revert "More bug fixing."
This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5
2019-07-20 16:33:33 +00:00
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
8a23f10040 gcc didn't like that 2019-03-12 00:27:22 +01:00
oldmud0
9008ec8d9d Remove constexpr from aoapplication.h 2019-01-21 02:49:00 +00:00
oldmud0
57b02c084a Bump version to 2.6.1 2019-01-03 21:46:10 -06:00
David Skoland
00cfd2750d moved headers into include and cpp files into src + logo into resource 2018-12-26 16:43:08 +01:00