darkredtitan 5cf7225f52 Tried to manually merge kamilprzyb and main repo's code (#45) ... * Merge kamilprzyb and main repo's code * Update Makefile by FunnHornhoover * Update Makefile by FinnHornhoover * Add flag to Makefile by FinnHornhoover * Remove extra line from makefile * Remove lbcrypt from Makefile * Fix flag to Makefile by FinnHornhoover * Reimplement potential fix for tutorial blackscreen by Dongresources * Update CMakeLists.txt * Update CMakeLists.txt * Reinsert Jade's changes * Cosmetic Changes to Databases .h & .cpp * Remove CMakeSettings.json * Update Makefile by Finn Hornhoover * More cosmetic changes to Databases.cpp * More cosmetic changes to Databases.cpp * Remove unnecessary line (CMakeSettings.json) * Fix CNLoginServer.cpp * More cosmetic Changes to Database.hpp, edit Database.cpp to use JSON library onstead of json11 library, and delete json11 library files * Delete json11 library files * Delete JSON library to reupload * Reupload JSON library from main repo * Reupload JSON library from main repo * Fix syntax error * Fix Makefile * Remove commented line of code to be like master Co-authored-by: CPunch <sethtstubbs@gmail.com>		2020-08-28 13:02:03 -05:00
..
shell.c	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3.c	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3.h	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3ext.h	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3pp.cpp	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3pp.h	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3ppext.cpp	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00
sqlite3ppext.h	Tried to manually merge kamilprzyb and main repo's code (#45)	2020-08-28 13:02:03 -05:00