diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /freetype/src/tools/docmaker | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'freetype/src/tools/docmaker')
| -rw-r--r-- | freetype/src/tools/docmaker/content.py | 2 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/docmaker.py | 2 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/formatter.py | 2 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/sources.py | 2 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/tohtml.py | 2 | ||||
| -rw-r--r-- | freetype/src/tools/docmaker/utils.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/freetype/src/tools/docmaker/content.py b/freetype/src/tools/docmaker/content.py index adea6f1d7..6887f0b84 100644 --- a/freetype/src/tools/docmaker/content.py +++ b/freetype/src/tools/docmaker/content.py @@ -3,7 +3,7 @@ # # Parse comment blocks to build content blocks (library file). # -# Copyright 2002, 2004, 2006-2009, 2012-2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/freetype/src/tools/docmaker/docmaker.py b/freetype/src/tools/docmaker/docmaker.py index 4fb1abf23..de82d930f 100644 --- a/freetype/src/tools/docmaker/docmaker.py +++ b/freetype/src/tools/docmaker/docmaker.py @@ -4,7 +4,7 @@ # # Convert source code markup to HTML documentation. # -# Copyright 2002, 2004, 2008, 2013, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/freetype/src/tools/docmaker/formatter.py b/freetype/src/tools/docmaker/formatter.py index 7152c019d..f0a8808c4 100644 --- a/freetype/src/tools/docmaker/formatter.py +++ b/freetype/src/tools/docmaker/formatter.py @@ -3,7 +3,7 @@ # # Convert parsed content blocks to a structured document (library file). # -# Copyright 2002, 2004, 2007, 2008, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/freetype/src/tools/docmaker/sources.py b/freetype/src/tools/docmaker/sources.py index 61ecc22c4..0cf21ce03 100644 --- a/freetype/src/tools/docmaker/sources.py +++ b/freetype/src/tools/docmaker/sources.py @@ -3,7 +3,7 @@ # # Convert source code comments to multi-line blocks (library file). # -# Copyright 2002-2004, 2006-2009, 2012-2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/freetype/src/tools/docmaker/tohtml.py b/freetype/src/tools/docmaker/tohtml.py index 05fc08a92..bc6bcf051 100644 --- a/freetype/src/tools/docmaker/tohtml.py +++ b/freetype/src/tools/docmaker/tohtml.py @@ -3,7 +3,7 @@ # # A sub-class container of the `Formatter' class to produce HTML. # -# Copyright 2002, 2003, 2005-2008, 2013, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/freetype/src/tools/docmaker/utils.py b/freetype/src/tools/docmaker/utils.py index b35823ab7..52af17a3a 100644 --- a/freetype/src/tools/docmaker/utils.py +++ b/freetype/src/tools/docmaker/utils.py @@ -3,7 +3,7 @@ # # Auxiliary functions for the `docmaker' tool (library file). # -# Copyright 2002, 2004, 2007, 2008, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, |