aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorLines
2018-09-02Squashed 'pugl/' changes from 4fed5fe..035884aHanspeter Portner-15/+7
2018-09-02Merge commit 'a40d223e7a1a7e1dc7640c068ae1265dc6e2a438'Hanspeter Portner-15/+7
2018-05-19meson: support BSDs.Hanspeter Portner-8/+8
2018-05-18use gitlab CI provided meson toolchainHanspeter Portner-109/+2
2018-05-15Merge commit '3d1bee455e1c29f1c99b1b9b4bc7c359d0e599b3'Hanspeter Portner-6/+12
2018-05-15Squashed 'nk_pugl/' changes from 224e389..226f907Hanspeter Portner-6/+12
2018-05-15meson: remove superfluous dependency.Hanspeter Portner-4/+2
2018-05-14initial migration to meson.Hanspeter Portner-247/+236
2018-03-25Merge commit 'f913efd351e69f1a99c9e4a39015050d7a3203cb'Hanspeter Portner-4/+6
2018-03-25Squashed 'nuklear/' changes from 2638e1b..665b266Hanspeter Portner-4/+6
2018-03-18Merge commit '30e673bf35aca72a764fa479ce379c86a8ebdfb4'Hanspeter Portner-264/+1105
2018-03-18Squashed 'nuklear/' changes from 645013d..2638e1bHanspeter Portner-264/+1105
2018-02-26Merge commit 'ad1d8f0444edc14da545efb5ac5471184b6743f5'Hanspeter Portner-1/+11
2018-02-26Squashed 'nuklear/' changes from 2d8b6dc..645013dHanspeter Portner-1/+11
2018-01-10Squashed 'nk_pugl/' changes from 5a18318..224e389Hanspeter Portner-0/+23
2018-01-10Merge commit '1b221933581ebe90352de2c238a689afcdb1468f'Hanspeter Portner-0/+23
2018-01-09Squashed 'nuklear/' changes from ecf3995..2d8b6dcHanspeter Portner-5263/+6234
2018-01-09Merge commit '1d23ad024799410449e88d3aa02ed2b82f6a9b6f'Hanspeter Portner-5263/+6234
2018-01-09Squashed 'nk_pugl/' changes from 7a0c32e..5a18318Hanspeter Portner-0/+23
2018-01-09Merge commit '4c0404bd5d56dc409cc8539a6199a4c05361279c'Hanspeter Portner-0/+23
2018-01-06fix dials to work with updated nuklear.Hanspeter Portner-57/+110
2018-01-06Squashed 'nk_pugl/' changes from e8cbe22..7a0c32eHanspeter Portner-3/+0
2018-01-06Merge commit 'c32891fd53fcc1458ed9a464b8596f9e3c3394bc'Hanspeter Portner-3/+0
2018-01-06Squashed 'nk_pugl/' changes from 643f07a..e8cbe22Hanspeter Portner-1/+25
2018-01-06Merge commit '5c7722e0a3ec527f1dd19d556c30ec75c9c748db'Hanspeter Portner-1/+25
2018-01-05Squashed 'nuklear/' changes from e8761c7..ecf3995Hanspeter Portner-10/+18
2018-01-05Merge commit 'b383b29b1c021cc7cc930c6ca4fbf888a8ebee2c'Hanspeter Portner-10/+18
2018-01-03small fixes.Hanspeter Portner-7/+9
2017-11-18nk: remove superfluous nk api call.Hanspeter Portner-2/+1
2017-11-18Squashed 'nk_pugl/' changes from ecc68d7..643f07aHanspeter Portner-1/+0
2017-11-18Merge commit '79a501a1678f3a2a81a8ff1dfc3fb8ecfdf0cfe0'Hanspeter Portner-1/+0
2017-10-20nk: fixes for updated nuklear.Hanspeter Portner-6/+7
2017-10-20Squashed 'nuklear/' changes from 407126c..e8761c7Hanspeter Portner-1497/+11777
2017-10-20Merge commit '658b7d575d49481fa79629477a6893fed358c5fe'Hanspeter Portner-1497/+11777
2017-10-20Squashed 'nk_pugl/' changes from fa04a9a..ecc68d7Hanspeter Portner-2/+2
2017-10-20Merge commit '414b624f2a2f69403fe0d9fa31ce6a43339fae6a'Hanspeter Portner-2/+2
2017-09-01nk: implement resize feature/extension.Hanspeter Portner-3/+17
2017-09-01Squashed 'nk_pugl/' changes from 7709c91..fa04a9aHanspeter Portner-3/+20
2017-09-01Merge commit '0d4445530051ac6385873bc2c0b21d197ad67760'Hanspeter Portner-3/+20
2017-08-30Squashed 'nuklear/' changes from 12257a4..407126cHanspeter Portner-3/+4
2017-08-30Merge commit '2cf9afaa38e2feeb072eb9d2ec85ecb3f4052d1e'Hanspeter Portner-3/+4
2017-08-12Squashed 'nk_pugl/' changes from 2a37459..7709c91Hanspeter Portner-4/+9
2017-08-12Merge commit '8cb082aadfa97cbd20dcb643b35ff0ffcf4a3297'Hanspeter Portner-4/+9
2017-08-09Squashed 'pugl/' changes from 0406d71..4fed5feHanspeter Portner-1/+1
2017-08-09Merge commit 'd6844969ae9dc89bd437a8ea349273242197c2ff'Hanspeter Portner-1/+1
2017-07-05Squashed 'nuklear/' changes from 01eb4f8..12257a4Hanspeter Portner-1429/+1375
2017-07-05Merge commit 'acef0e39c3a30753792641dc4cb3aebe05eb7b21'Hanspeter Portner-0/+0
2017-07-05Squashed 'pugl/' changes from a7a6fb7..0406d71Hanspeter Portner-37/+366
2017-07-05Merge commit '9e9b0b23755c95235296b8ec44a9ec7260f3d6ab'Hanspeter Portner-0/+0
2017-07-05Squashed 'nk_pugl/' changes from 57bcde3..2a37459Hanspeter Portner-192/+554