diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
| commit | acff15562431d5d9e9f091ed7cf912f5fe34a61a (patch) | |
| tree | e78502e7eda84696632be9b6539d386b829053b2 /resources | |
| parent | 49dc9695f5204bb80a91214c411bcb1b868ee0db (diff) | |
| parent | 9d4e840a6e1a7169a2863fa1ff1812f8fe19e615 (diff) | |
| download | MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.gz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.lz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.xz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.zip | |
Merge branch 'feature_screenshots' into integration_json_and_tools
Conflicts:
logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file.
Diffstat (limited to 'resources')
0 files changed, 0 insertions, 0 deletions