summaryrefslogtreecommitdiffstats
path: root/libutil/include/userutils.h
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of http://github.com/peterix/MultiMC5Orochimarufan2013-02-21-0/+17
Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp