Jesse Bryan cdbe19e213 discord: fix merge conflicts

2018-08-18 21:16:12 -05:00

..

msg_hash_ar.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_ar.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_chs.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_chs.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_cht.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_cht.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_de.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_de.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_eo.c

…

msg_hash_eo.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_es.c

Implement Slow motion toggle

2018-03-10 18:42:45 +01:00

msg_hash_es.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_fr.c

…

msg_hash_fr.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_it.c

Implement Slow motion toggle

2018-03-10 18:42:45 +01:00

msg_hash_it.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_ja.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_ja.h

discord: fix merge conflicts

2018-08-18 21:16:12 -05:00

msg_hash_ko.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_ko.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_lbl.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_nl.c

…

msg_hash_nl.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_pl.c

Update Polish language - use the header

2017-12-18 19:46:28 +01:00

msg_hash_pl.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_pt_br.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_pt_br.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_pt_pt.c

Implement Slow motion toggle

2018-03-10 18:42:45 +01:00

msg_hash_pt_pt.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_ru.c

add missing UTF-8 BOMs back for MSVC

2017-11-27 17:42:45 -05:00

msg_hash_ru.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00

msg_hash_us.c

Merge pull request #7042 from Tatsuya79/master

2018-08-10 21:15:58 +02:00

msg_hash_us.h

discord: fix merge conflicts

2018-08-18 21:16:12 -05:00

msg_hash_vn.c

new setting "input_bind_hold"

2018-06-29 21:12:45 -05:00

msg_hash_vn.h

discord: added additional discord events and other improvements

2018-08-18 02:12:51 -05:00