Commit Graph

9 Commits

Author SHA1 Message Date
Lauritz V. Thaulow fae49716c3 Fix typo in graphics guide docs 2014-10-20 23:10:33 +02:00
akshayaurora 11210a1737 Merge branch 'master' of http://github.com/kivy/kivy into sdl2-support
Conflicts:
	.gitignore
	doc/sources/faq.rst
	doc/sources/guide/android.rst
	examples/audio/audio.kv
	examples/audio/main.py
	kivy/_event.pyx
	kivy/adapters/__init__.py
	kivy/adapters/adapter.py
	kivy/config.py
	kivy/core/clipboard/__init__.py
	kivy/core/image/img_imageio.pyx
	kivy/core/image/img_pil.py
	kivy/core/video/video_ffpyplayer.py
	kivy/core/video/video_gi.py
	kivy/core/video/video_gstplayer.py
	kivy/core/video/video_pygst.py
	kivy/core/window/__init__.py
	kivy/event.py
	kivy/graphics/common.pxi
	kivy/graphics/texture.pyx
	kivy/graphics/vertex_instructions.pyx
	kivy/graphics/vertex_instructions_line.pxi
	kivy/input/providers/androidjoystick.py
	kivy/input/providers/mouse.py
	kivy/lib/gstplayer/_gstplayer.pyx
	kivy/network/urlrequest.py
	kivy/properties.pyx
	kivy/tools/packaging/win32/kivy-2.7.bat
	kivy/tools/packaging/win32/kivy-3.3.bat
	kivy/tools/packaging/win32/kivy.bat
	kivy/uix/behaviors.py
	kivy/uix/checkbox.py
	kivy/uix/codeinput.py
	kivy/uix/dropdown.py
	kivy/uix/listview.py
	kivy/uix/screenmanager.py
	kivy/uix/scrollview.py
	kivy/uix/textinput.py
	kivy/uix/vkeyboard.py
	kivy/uix/widget.py
	kivy/utils.py
	setup.py
2014-09-21 20:38:29 +05:30
Zen-CODE a20d45ca1c doc: added advice on best pracises to guide/graphics.rst 2014-08-25 18:40:21 +02:00
akshayaurora 0657843e91 Bring sdl2 in line with current master and other fixes to make things usable. Sponsored by ScramSoft. 2014-08-23 17:15:04 +05:30
Zen-CODE c505fb9cf6 doc: Fixed typo for Rect 2014-08-06 21:29:30 +02:00
Zen-CODE 21affb9fe4 Fixed broken links and changed capitalization for consistency 2013-03-24 15:08:25 -05:00
Zen-CODE b359211ee8 Small fixes to the grammar 2013-03-19 05:32:41 -05:00
Mathieu Virbel e97a588620 doc: update canvas before/after doc according to the PR. Closes #1019 2013-03-20 17:29:58 -07:00
qua-non 50de7293e7 doc: merge guide 2 with guide 2013-03-20 09:10:45 +05:30