Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-20 04:56:36 +02:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Jfreegman
2016-06-12 18:27:54 -04:00
parent 60b431459c 9fcbc3bde0
commit 43d9623877
32 changed files with 429 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
misc/toxic.conf.example
View File

@ -29,6 +29,9 @@ ui = {
// true to show the welcome message on startup
show_welcome_msg=true;
// true to show friend connection change messages on the home screen
show_connection_msg=true;
// maximum lines for chat window history
history_size=700;
@ -90,6 +93,7 @@ sounds = {
// Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
// Note: All printable keys register as input
// Note2: Ctrl+M does not work
keys = {
next_tab="Ctrl+P";
prev_tab="Ctrl+O";
@ -101,5 +105,6 @@ keys = {
peer_list_up="Ctrl+[";
peer_list_down="Ctrl+]";
toggle_peerlist="Ctrl+b";
toggle_paste_mode="Ctrl+T";
};