diff options
Diffstat (limited to 'doc/user/mergeflags.xml')
| -rw-r--r-- | doc/user/mergeflags.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml index 615724a..edd9850 100644 --- a/doc/user/mergeflags.xml +++ b/doc/user/mergeflags.xml @@ -21,7 +21,7 @@ <!-- - Copyright (c) 2001 - 2014 The SCons Foundation + Copyright (c) 2001 - 2015 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |