Merge remote-tracking branch 'origin/master' into photon

2026-09-23 07:14:28 +08:00 · 2017-05-01 18:06:23 -06:00
parent 25e0f31637 c59a5efcae
commit f7a28c09b0
5 changed files with 1562 additions and 72 deletions
@@ -8,6 +8,7 @@
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
+ *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright