diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
| commit | 49dc9695f5204bb80a91214c411bcb1b868ee0db (patch) | |
| tree | a7867064f70ab7888c32eebf42e4bdc8bc59c32e /gui/Platform_Other.cpp | |
| parent | f7c97efcf3785f597417895945b24c2e7476cba8 (diff) | |
| parent | 0b56b5efafffca77d6deee966097c55e78fb0aef (diff) | |
| download | PrismLauncher-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.gz PrismLauncher-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.bz2 PrismLauncher-49dc9695f5204bb80a91214c411bcb1b868ee0db.zip | |
Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
logic/OneSixInstance.cpp
logic/OneSixVersionBuilder.cpp
Some fixage. Yay for conflicts.
Diffstat (limited to 'gui/Platform_Other.cpp')
0 files changed, 0 insertions, 0 deletions