[Python-checkins] cpython (merge 3.6 -> default): Issue #29024: Merge from 3.6

[berker.peksag]

https://hg.python.org/cpython/rev/4eb4cf6ac154
changeset:   105926:4eb4cf6ac154
parent:      105923:91c15294a0ab
parent:      105925:ee25895d9d65
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Jan 02 05:45:37 2017 +0300
summary:
  Issue #29024: Merge from 3.6

files:
  Doc/faq/gui.rst |  10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst
--- a/Doc/faq/gui.rst
+++ b/Doc/faq/gui.rst
@@ -77,6 +77,16 @@
 The older PyGtk bindings for the `Gtk+ 2 toolkit <http://www.gtk.org>`_ have
 been implemented by James Henstridge; see <http://www.pygtk.org>.
 
+Kivy
+----
+
+`Kivy <https://kivy.org/>`_ is a cross-platform GUI library supporting both
+desktop operating systems (Windows, macOS, Linux) and mobile devices (Android,
+iOS).  It is written in Python and Cython, and can use a range of windowing
+backends.
+
+Kivy is free and open source software distributed under the MIT license.
+
 FLTK
 ----
 

-- 
Repository URL: https://hg.python.org/cpython