• Hanspeter Portner's avatar
    Squashed 'nuklear/' changes from 2638e1b..665b266 · ccc60b96
    Hanspeter Portner authored
    665b266 omk: retain history and scroll-state in textedit.
    0bd758e Fix invalid y_offset bug in nk_group_begin.
    67b8747 fix NK_COMMAND_ARC/NK_COMMAND_ARC_FILLED.
    c5205f7 omk: don't clear draw_list.
    cef768d omk: fix lexer code to work with utf8.
    9f1a14c add support for syntax highlighting
    7e710ff Merge pull request #650 from nathanrw/master
    cf05d73 Add reference to pynk
    1acb673 Merge pull request #649 from Dickby/master
    0dabcdd correct major/minor version of opengl in x11_opengl2
    94c0412 Fixed #647 window open/close flickering
    REVERT: 2638e1b omk: retain history and scroll-state in textedit.
    REVERT: f32342b Fix invalid y_offset bug in nk_group_begin.
    REVERT: 7519da8 fix NK_COMMAND_ARC/NK_COMMAND_ARC_FILLED.
    REVERT: 72c37db omk: don't clear draw_list.
    REVERT: 5a65e52 omk: fix lexer code to work with utf8.
    REVERT: 92deced add support for syntax highlighting
    
    git-subtree-dir: nuklear
    git-subtree-split: 665b26680dec35c6d02ef423cc09af8bdcc0e53b
    ccc60b96
main.c 12.5 KB