diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-14 08:41:28 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-14 08:41:28 +0200 |
| commit | 544b5775c876175d33b7d14cd8efba615b8a50f7 (patch) | |
| tree | 2fb503356682c0ad0fb941ac9154de15bc46157a /doc/user/mergeflags.xml | |
| parent | 85dbcc01ae3f6b10849aa71faef6946d8e16d55f (diff) | |
| parent | 3023c58e287f26f5672cf5ddf991ba3197d1efb6 (diff) | |
Merge branch 'feature/upstream' into develop
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 36bb061..d802125 100644 --- a/doc/user/mergeflags.xml +++ b/doc/user/mergeflags.xml @@ -21,7 +21,7 @@ <!-- - Copyright (c) 2001 - 2017 The SCons Foundation + Copyright (c) 2001 - 2019 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |