Gabor Kiss-Vamosi e7afc94cde fix conflicts

2019-11-03 16:12:05 +01:00

..

lv_core

fix conflicts

2019-11-03 16:12:05 +01:00

lv_draw

fix conflicts

2019-11-03 16:12:05 +01:00

lv_font

merge dev-6.1

2019-10-30 06:59:51 +01:00

lv_hal

merge dev-6.1

2019-10-30 06:59:51 +01:00

lv_misc

lv_color1_t: Add 'ch' struct to union to fix 1bit color compilation error.

2019-11-01 11:10:43 +01:00

lv_objx

fix conflicts

2019-11-03 16:12:05 +01:00

lv_themes

tabview fix missing indicator

2019-10-31 07:07:22 +01:00

lv_api_map.h

add lv_api_map.h and rename lv_chart_get_point_cnt to lv_chart_get_point_count

2019-11-01 11:12:20 +01:00

lv_conf_checker.h

Merge branch 'feat-subpixel' into dev-6.1

2019-10-18 14:58:04 +02:00

lv_version.h

Update lv_version.h to reflect new development version

2019-09-21 07:02:34 -04:00