Merge remote-tracking branch 'cyoung/master'

pull/29/head
bradanlane 2015-09-01 17:39:10 -04:00
commit 3dba50f818
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright * Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
* Neither the name of the Joseph D Poirier nor the * Neither the name of the Christopher Young nor the
names of its contributors may be used to endorse or promote products names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission. derived from this software without specific prior written permission.