提交 5c9c75fc 编写于 作者: S Sean Barrett

Merge branch 'master' of https://github.com/nothings/stb

Conflicts:
	README.md
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
// Features Porting Bugfixes & Warnings // Features Porting Bugfixes & Warnings
// Sean Barrett github:r-leyh Jesus Fernandez // Sean Barrett github:r-leyh Jesus Fernandez
// Miguel Lechon github:Arbeiterunfallversicherungsgesetz // Miguel Lechon github:Arbeiterunfallversicherungsgesetz
// Thomas Frase James Hoffman // Thomas Frase James Hofmann
// //
// VERSION HISTORY // VERSION HISTORY
// //
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册