9caca5a4fb
# Conflicts: # .gitignore # etc/man.c # etc/your-reality.c # etc/your-reality.h # main.c # makefile
20 lines
No EOL
255 B
Text
20 lines
No EOL
255 B
Text
.vscode
|
|
glade/test_window.glade~
|
|
netbenixCMD
|
|
output.log
|
|
main.o
|
|
logger.o
|
|
help.o
|
|
logo.o
|
|
sql_test.o
|
|
gtk_test.o
|
|
sys_info.o
|
|
show_dir.o
|
|
change_dir.o
|
|
update_check.o
|
|
man.o
|
|
<<<<<<< HEAD
|
|
math.o
|
|
=======
|
|
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
|
|
your-reality.o |