diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
| commit | e5a4f8c6dbf0dcfc74bfd8ba99099d9fe1064642 (patch) | |
| tree | cf4f35e2a3b56525cf8c19a1b8fb3147d36f0229 /doc/user/mergeflags.in | |
| parent | 2323daae4add07272c0f4feb9243c352a9ca4b18 (diff) | |
| parent | cb3425abe0bc2d05caf401ca24b82a25a81f009d (diff) | |
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'doc/user/mergeflags.in')
| -rw-r--r-- | doc/user/mergeflags.in | 2 |
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 |