Commit graph

2 commits

Author SHA1 Message Date
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Gabriel Calero
ef8ba1cad0 Include config.h in ResourceImageItem.cpp. Minor fixes 2018-01-03 16:40:14 -03:00