Changeset [153ebd261fcc9fa78acf5689721864c9e5aeb379] by Jesse Gumm
Revision 153ebd261fcc9fa78acf5689721864c9e5aeb379,
committed by Jesse Gumm
· July 14th, 2014 @ 11:48 PM
Merge branch 'master' into ws
Conflicts:
Makefile
https://github.com/nitrogen/nitrogen/commit/153ebd261fcc9fa78acf568...
4 changed files
-
M
CHANGELOG.markdown -
M
Makefile -
M
TODO.markdown -
M
rel/overlay/common/etc/vm.args