Changeset [4a76c4e014ab287c0fe14fbd2bc1b19466eb4eee] by Jesse Gumm
Revision 4a76c4e014ab287c0fe14fbd2bc1b19466eb4eee,
committed by Jesse Gumm
· July 30th, 2014 @ 03:30 PM
Merge branch 'master' into ws
Conflicts:
Makefile
https://github.com/nitrogen/nitrogen/commit/4a76c4e014ab287c0fe14fb...
2 changed files
-
M
CHANGELOG.markdown -
M
Makefile