summaryrefslogtreecommitdiffstats
path: root/logic/OneSixRule.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-02-24 02:35:01 +0100
committerPetr Mrázek <peterix@gmail.com>2014-02-24 02:35:01 +0100
commit49dc9695f5204bb80a91214c411bcb1b868ee0db (patch)
treea7867064f70ab7888c32eebf42e4bdc8bc59c32e /logic/OneSixRule.h
parentf7c97efcf3785f597417895945b24c2e7476cba8 (diff)
parent0b56b5efafffca77d6deee966097c55e78fb0aef (diff)
downloadMultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.gz
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.lz
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.xz
MultiMC-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 'logic/OneSixRule.h')
0 files changed, 0 insertions, 0 deletions