1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-09 21:30:42 +00:00
profanity/src
James Booth 37353edf98 Merge branch 'master' into xep0308-last-message-correction
Conflicts:
	src/command/cmd_ac.c
	src/command/cmd_defs.c
2017-04-29 23:01:09 +01:00
..
command Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
config Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
event Merge branch 'master' into xep0308-last-message-correction 2017-01-28 17:30:15 +00:00
otr Merge branch 'master' into xep0308-last-message-correction 2017-01-28 17:30:15 +00:00
pgp Allow previous autocompletion with shift tab 2017-04-01 00:27:11 +01:00
plugins Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
tools Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
ui Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
xmpp Merge branch 'master' into xep0308-last-message-correction 2017-04-29 23:01:09 +01:00
common.c Set locale in unit tests 2017-04-29 20:33:28 +01:00
common.h Update Glib dependency to 2.40 2017-03-25 02:07:27 +00:00
log.c Update Copyright 2017-01-28 17:24:22 +00:00
log.h Update Copyright 2017-01-28 17:24:22 +00:00
main.c Update Copyright 2017-01-28 17:24:22 +00:00
profanity.c Update Copyright 2017-01-28 17:24:22 +00:00
profanity.h Update Copyright 2017-01-28 17:24:22 +00:00