=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/COPYING,v retrieving revision 1.2 retrieving revision 1.3 diff -c -r1.2 -r1.3 *** src/usr.bin/lex/COPYING 2001/06/17 07:30:41 1.2 --- src/usr.bin/lex/COPYING 2003/06/04 17:34:44 1.3 *************** *** 13,27 **** Department of Energy and the University of California. Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that: (1) source distributions ! retain this entire copyright notice and comment, and (2) distributions ! including binaries display the following acknowledgement: ``This product ! includes software developed by the University of California, ! Berkeley and its contributors'' in the documentation or other ! materials provided with the distribution and in all advertising ! materials mentioning features or use of this software. 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. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR --- 13,29 ---- Department of Energy and the University of California. 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 ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! 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. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR