1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-07 10:56:35 +01:00

Fix merge conflicts

This commit is contained in:
Jfreegman
2016-06-12 18:27:54 -04:00
32 changed files with 429 additions and 264 deletions

View File

@@ -70,6 +70,7 @@
#define T_KEY_C_L 0x0C /* ctrl-l */
#define T_KEY_C_W 0x17 /* ctrl-w */
#define T_KEY_C_B 0x02 /* ctrl-b */
#define T_KEY_C_T 0x14 /* ctrl-t */
#define T_KEY_TAB 0x09 /* TAB key */
#define ONLINE_CHAR "*"