Merge pull request #5390 from StevenPuttemans:add_markers_2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 23 Nov 2015 13:40:00 +0000 (13:40 +0000)
commit42001234ab080253c4ee34af778fd10c2644dc16
treefa8c626219cca06cb69631d5c9aa341ff7b0c753
parent6e885e57752ed6c2ed7ea1c81aca7b4a17d63e17
parent406cfc48c95457356667aefd0bb39e734e6527b2
Merge pull request #5390 from StevenPuttemans:add_markers_2.4
modules/core/src/drawing.cpp