Merged remove-keywords-3.15 branch

2016-07-21 14:12:51 -05:00
parent 4223b31f9a 3d4d3181de
commit f169781de0
732 changed files with 133 additions and 1791 deletions
--- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
@@ -9,15 +9,6 @@
 \*************************************************************************/

 /*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
 *	Author Jeffrey O. Hill
 *	johill@lanl.gov
 */