about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into pgpJames Booth2015-05-0435-643/+643
|\
| * Use null check convention in roster_list.cJames Booth2015-05-041-15/+15
| * Use null check convention in resource.cJames Booth2015-05-041-2/+2
| * Use null check convention in profanity.cJames Booth2015-05-041-2/+2
| * Use null check convention in log.cJames Booth2015-05-041-8/+8
| * Use null check convention in jid.cJames Booth2015-05-041-5/+5
| * Use null check convention in contact.cJames Booth2015-05-041-14/+14
| * Use null check convention in common.cJames Booth2015-05-041-10/+10
| * Use null check convention in chat_session.cJames Booth2015-05-041-2/+2
| * Use null check convention in stanza.cJames Booth2015-05-041-32/+32
| * Use null check convention in roster.cJames Booth2015-05-041-11/+11
| * Use null check convention in presence.cJames Booth2015-05-041-21/+21
| * Use null check convention in iq.cJames Booth2015-05-041-48/+48
| * Use null check convention in form.cJames Booth2015-05-041-1/+1
| * Use null check convention in connection.cJames Booth2015-05-041-12/+12
| * Use null check convention in capabilities.cJames Booth2015-05-041-15/+15
| * Use null check convention in bookmark.cJames Booth2015-05-041-11/+11
| * Use null check convention in windows.cJames Booth2015-05-041-18/+18
| * Use null check convention in window.cJames Booth2015-05-041-38/+38
| * Use null check convention in titlebar.cJames Booth2015-05-041-3/+3
| * Use null check convention in statusbar.cJames Booth2015-05-041-7/+7
| * Use null check convention in notifier.cJames Booth2015-05-041-4/+4
| * Use null check convention in core.cJames Booth2015-05-041-62/+62
| * Use null check convention in console.cJames Booth2015-05-041-80/+80
| * Use null check convention in tinyurl.cJames Booth2015-05-041-1/+1
| * Use null check convention in parser.cJames Booth2015-05-041-4/+4
| * Use null check convention in otrlibv4.cJames Booth2015-05-041-1/+1
| * Use null check convention in otrlibv3.cJames Booth2015-05-041-3/+3
| * Use null check convention in otr.cJames Booth2015-05-041-9/+9
| * Use null check convention in server_events.cJames Booth2015-05-041-7/+7
| * Use null check convention in theme.cJames Booth2015-05-041-8/+8
| * Use null check convention in preferences.cJames Booth2015-05-041-4/+4
| * Use null check convention in accounts.cJames Booth2015-05-041-17/+17
| * Use null check convention in account.cJames Booth2015-05-041-8/+8
| * Use null check convention in commands.cJames Booth2015-05-041-50/+50
| * Use null check convention in command.cJames Booth2015-05-041-110/+110
* | Merge branch 'master' into pgpJames Booth2015-05-044-10/+15
|\|
| * Added enc_mode to ProfChatWinJames Booth2015-05-044-10/+15
* | Merge branch 'master' into pgpJames Booth2015-05-041-40/+54
|\|
| * Extracted carbons handlingJames Booth2015-05-041-41/+55
* | Merge branch 'master' into pgpJames Booth2015-05-041-52/+52
|\|
| * Revert "Added carbons handler"James Booth2015-05-041-52/+52
* | Merge branch 'master' into pgpJames Booth2015-05-048-27/+33
|\|
| * Added ui_ev_new_private_win to ui eventsJames Booth2015-05-048-27/+33
* | Merge branch 'master' into pgpJames Booth2015-05-043-5/+5
|\|
| * cl_ev_send_muc_msg takes ProfMucWin as argJames Booth2015-05-043-5/+5
* | Merge branch 'master' into pgpJames Booth2015-05-045-15/+13
|\|
| * ui_outgoing_chat_msg now takes ProfChatWin as argumentJames Booth2015-05-045-15/+13
* | Merge branch 'master' into pgpJames Booth2015-05-043-24/+37
|\|
| * Added roster list function to get display name for messagesJames Booth2015-05-033-24/+37