summaryrefslogtreecommitdiff
path: root/doc/user/mergeflags.in
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/mergeflags.in')
-rw-r--r--doc/user/mergeflags.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/mergeflags.in b/doc/user/mergeflags.in
index a218849..f1997a0 100644
--- a/doc/user/mergeflags.in
+++ b/doc/user/mergeflags.in
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the