diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-06-21 07:55:31 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-06-21 07:55:31 +0200 |
| commit | 39fa0bace059116d9a45e09fcd18691390b166bd (patch) | |
| tree | 77f5abf2964bd92dc9e338654a4ffaaffc24d9ce /doc/user/mergeflags.xml | |
| parent | f9b0c331d8b9d03be91b56e324f59424af45302b (diff) | |
| parent | f7e5d2b46b03cc4bc09c38f7e0873378bb9c3b78 (diff) | |
Merge tag 'upstream/2.3.5'
Upstream version 2.3.5
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 |