diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /docs/source/conf.py | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'docs/source/conf.py')
-rw-r--r-- | docs/source/conf.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py index acc99a66fbd..4130e982e30 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -32,6 +32,7 @@ extensions = [ 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'edit_on_github', + 'sphinxcontrib.rsvgconverter' ] edit_on_github_project = 'mamedev/mame' @@ -54,16 +55,16 @@ master_doc = 'index' # General information about the project. project = u'MAME Documentation' -copyright = u'2018, MAMEdev Team' +copyright = u'2019, MAMEdev Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.194' +version = '0.205' # The full version, including alpha/beta/rc tags. -release = '0.194' +release = '0.205' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |