aboutsummaryrefslogtreecommitdiff
path: root/logic/net/URLConstants.cpp
AgeCommit message (Collapse)Author
2014-02-25Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek
Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.