]> git.mdlowis.com Git - proto/aos.git/commit
resolved conflict
authorMichael D. Lowis <mike.lowis@gentex.com>
Wed, 15 Dec 2021 14:05:57 +0000 (09:05 -0500)
committerMichael D. Lowis <mike.lowis@gentex.com>
Wed, 15 Dec 2021 14:05:57 +0000 (09:05 -0500)
commitf2165d30c7749fcd9d4f42ca571023a96ad38a4a
tree0af00ab838ccbfacbc1f2882ba2281d219f8a48b
parent3a383c6a78b95435cdbaba1d82735466ef09796b
resolved conflict
bin/edit.c
inc/libui.h
lib/a/gc.c
lib/a/opts_parse.c
lib/a/opts_setoption.c [new file with mode: 0644]
tools/build.sh