diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:53 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:53 +0200 |
| commit | ba4425ab5227fd9597fccd368bffff6bf1032149 (patch) | |
| tree | b286bf4e65900f6a7604c001dc2ad94fec12e768 /doc/user/mergeflags.xml | |
| parent | 84c6f9729dbbc175431874957d0654310410bd6f (diff) | |
Imported Upstream version 2.1.0upstream/2.1.0
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 ab10e54..f0bc2b6 100644 --- a/doc/user/mergeflags.xml +++ b/doc/user/mergeflags.xml @@ -1,6 +1,6 @@ <!-- - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |