diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-04-07 17:44:52 +0200 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-04-07 17:44:52 +0200 |
| commit | 3cd2b898e5bbf00d22647b2b114502c0a8076495 (patch) | |
| tree | cff8e7bcd5c210c07011ffafaede79dc00b69082 /depends/settings/libsettings_config.h | |
| parent | dd7b6642a3b171734126b6b4a14236cfe6406fcf (diff) | |
| parent | 17d4947b30f00a347d7fb8648040271e4b65f966 (diff) | |
| download | MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.gz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.lz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.xz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.zip | |
Merge remote-tracking branch 'origin/develop' into feature_cmake_style
Conflicts:
CMakeLists.txt
Diffstat (limited to 'depends/settings/libsettings_config.h')
0 files changed, 0 insertions, 0 deletions