mirror of
https://gitea.nishi.boats/pyrite-dev/milsko
synced 2026-01-29 20:43:05 +00:00
merge conflict
This commit is contained in:
@@ -65,6 +65,7 @@ new_object("src/icon/*.c");
|
||||
new_object("src/font/*.c");
|
||||
new_object("src/cursor/*.c");
|
||||
|
||||
new_object("src/widget/box.c");
|
||||
new_object("src/widget/button.c");
|
||||
new_object("src/widget/checkbox.c");
|
||||
new_object("src/widget/combobox.c");
|
||||
@@ -110,6 +111,7 @@ new_example("examples/basic/progressbar");
|
||||
new_example("examples/basic/colorpicker");
|
||||
new_example("examples/basic/combobox");
|
||||
new_example("examples/basic/treeview");
|
||||
new_example("examples/basic/box");
|
||||
|
||||
if (param_get("opengl")) {
|
||||
new_example("examples/gldemos/boing", $gl_libs);
|
||||
|
||||
Reference in New Issue
Block a user