Merge from trunk and resolve conflicts.

[gnu-emacs] / src / w32common.h

diff --git a/src/w32common.h b/src/w32common.h
index 5e9b61824aef243c21c976c4b79bc5863a71bad8..79fe5cc367c238fe55379ba373d84b7dfceeef91 100644 (file)
--- a/src/w32common.h
+++ b/src/w32common.h
@@ -1,5 +1,5 @@
 /* Common functions for Microsoft Windows builds of Emacs
-   Copyright (C) 2012 Free Software Foundation, Inc.
+   Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.