diff options
| author | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
| commit | 23474da17500b35bf4fb2a754021175361baab00 (patch) | |
| tree | db2dda426ec4a91982f5f5539b08cc7c3bb1fd35 /libsettings | |
| parent | 498225debdb22d83e591635dbd172cca12476279 (diff) | |
| parent | 4fd5bdb01b27c99f16c9acf3c7ac13c7ea719800 (diff) | |
| download | PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.tar.gz PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.tar.bz2 PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
main.cpp
Diffstat (limited to 'libsettings')
0 files changed, 0 insertions, 0 deletions