Merge pull request #458 from TheBlueMatt/copyright
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 11 Aug 2011 17:34:29 +0000 (10:34 -0700)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 11 Aug 2011 17:34:29 +0000 (10:34 -0700)
Unify copyright notices.

1  2 
src/db.cpp
src/key.h
src/main.cpp
src/net.cpp
src/net.h
src/script.h
src/serialize.h

diff --cc src/db.cpp
Simple merge
diff --cc src/key.h
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/net.cpp
Simple merge
diff --cc src/net.h
Simple merge
diff --cc src/script.h
Simple merge
diff --cc src/serialize.h
Simple merge