Mercurial > MadButterfly
changeset 919:d2863fa9720b
Merge from head.
author | pingooo |
---|---|
date | Tue, 26 Oct 2010 21:28:04 +0800 |
parents | 92a97858c7e3 (current diff) b8c3a8fc32d0 (diff) |
children | f02f3f20ce95 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYING.h Tue Oct 26 21:26:40 2010 +0800 +++ b/COPYING.h Tue Oct 26 21:28:04 2010 +0800 @@ -12,7 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *