summaryrefslogtreecommitdiffstats
path: root/BUILD.md
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-06-28 08:49:18 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-28 08:49:18 +0200
commit30b1f5e5cf935689fc628e37016e650655153d00 (patch)
tree3e03af0b1e84306214347b7c0ba41f6d99ed2e42 /BUILD.md
parentd6e5c472b51b3150cdac0e4b63ca89a171d881af (diff)
parent7f4073840a9732d03c9f71f9baa08502f0bf2d94 (diff)
downloadMultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar
MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.gz
MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.lz
MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.tar.xz
MultiMC-30b1f5e5cf935689fc628e37016e650655153d00.zip
Merge branch 'feature/fix_intel' into develop
Conflicts: CMakeLists.txt changelog.yaml gui/MainWindow.cpp
Diffstat (limited to 'BUILD.md')
0 files changed, 0 insertions, 0 deletions