0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cc1de6a64991a942fdbbb6cdfe24ea1ee268fffb
pollymc/logic/BaseInstance.h
Petr Mrázek 49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools 
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
2014-02-24 02:35:01 +01:00

6.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink