summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJeremy Rimpo <jeremy.rimpo@servermonkey.com>2017-10-30 17:45:03 -0500
committerGitHub <noreply@github.com>2017-10-30 17:45:03 -0500
commit5cb0d1cb3d8e003d8a58ddb180cf3c1f58241580 (patch)
tree54b755f6d92bbcbb375884e63e7657a94eb0b54b /src/main.cpp
parent88452e5d76467fc687a9c4d6b6aaf7381d2463e1 (diff)
parentd53591c6c9c2702d361a70417f37f4508fc43552 (diff)
Merge pull request #2 from Al12rs/QT5.7
Merge upstream + potential while fix
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions