diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:22:02 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-01-23 15:22:02 +0100 |
| commit | 48f19e9e5ecc069f379ad433fdaf280ac9b54e16 (patch) | |
| tree | ccb7df7851740465e630eeda7f618e66d1f86f53 /doc/user/mergeflags.xml | |
| parent | 72c578fd4b0b4a5a43e18594339ac4ff26c376dc (diff) | |
Imported Upstream version 1.2.0.d20100117upstream/1.2.0.d20100117
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 7edc986..ab10e54 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 The SCons Foundation + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |