Jesse Bryan 5bda0b3a61 general: fixed the merge conflict

2018-08-21 14:57:59 -05:00

..

msg_hash_ar.c

…

msg_hash_ar.h

discord: added additional discord events and other improvements

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

msg_hash_chs.c

…

msg_hash_chs.h

discord: added additional discord events and other improvements

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

msg_hash_cht.c

…

msg_hash_cht.h

discord: added additional discord events and other improvements

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

msg_hash_de.c

…

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

…

msg_hash_es.h

general: fixed the merge conflict

2018-08-21 14:57:59 -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

…

msg_hash_it.h

discord: added additional discord events and other improvements

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

msg_hash_ja.c

…

msg_hash_ja.h

general: fixed the merge conflict

2018-08-21 14:57:59 -05:00

msg_hash_ko.c

…

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

…

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

…

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

…

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

…

msg_hash_ru.h

discord: added additional discord events and other improvements

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

msg_hash_us.c

update vrr runloop help

2018-08-21 18:47:06 +02:00

msg_hash_us.h

general: fixed the merge conflict

2018-08-21 14:57:59 -05:00

msg_hash_vn.c

…

msg_hash_vn.h

discord: added additional discord events and other improvements

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