1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
profanity/src
James Booth e1b53df036 Merge branch 'master' into plugins
Conflicts:
	.travis.yml
	configure.ac
	src/profanity.c
2014-05-22 20:20:24 +01:00
..
command Merge branch 'master' into plugins 2014-05-20 00:12:00 +01:00
config Merge branch 'master' into plugins 2014-05-22 20:20:24 +01:00
otr Added OTR preferences to /account show commmand 2014-05-11 19:49:18 +01:00
plugins Merge branch 'master' into plugins 2014-04-09 22:48:01 +01:00
tools Added common.h to parser.c 2014-05-22 20:07:43 +01:00
ui Merge branch 'master' into plugins 2014-05-20 00:12:00 +01:00
xmpp Merge branch 'master' into plugins 2014-05-10 00:51:45 +01:00
chat_session.c Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
chat_session.h Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
common.c Merge branch 'master' into plugins 2014-05-22 20:20:24 +01:00
common.h Fixed define for g_hash_table_contains (glib < 2.32) 2014-05-22 20:03:47 +01:00
contact.c Updated copyright 2014-03-09 01:18:19 +00:00
contact.h Updated copyright 2014-03-09 01:18:19 +00:00
jid.c Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
jid.h Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
log.c Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
log.h Added /log where command 2014-04-13 22:20:15 +01:00
main.c Merge branch 'master' into plugins 2014-04-23 23:01:58 +01:00
muc.c Added backwards compatible g_list_free_full for glib < 2.28 2014-05-21 21:39:31 +01:00
muc.h Handle room subject and broadcasts sent before roster received 2014-05-05 20:13:22 +01:00
profanity.c Merge branch 'master' into plugins 2014-05-22 20:20:24 +01:00
profanity.h Merge branch 'master' into plugins 2014-03-09 01:22:13 +00:00
resource.c Updated copyright 2014-03-09 01:18:19 +00:00
resource.h Updated copyright 2014-03-09 01:18:19 +00:00
roster_list.c Updated copyright 2014-03-09 01:18:19 +00:00
roster_list.h Updated copyright 2014-03-09 01:18:19 +00:00
server_events.c Merge branch 'master' into plugins 2014-05-20 00:12:00 +01:00
server_events.h Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00