James Booth 4e97c1e460 Merge branch 'master' into otr

2014-01-12 01:25:35 +00:00

..

console.c

Added /otr theirfp with hardcoded fingerprint

2014-01-11 19:10:00 +00:00

core.c

Added /otr trust|untrust commands

2014-01-12 01:20:22 +00:00

inputwin.c

Bind remaining ui functions in main.c

2013-12-23 00:23:22 +00:00

notifier.c

Bind remaining ui functions in main.c

2013-12-23 00:23:22 +00:00

statusbar.c

Bind remaining ui functions in main.c

2013-12-23 00:23:22 +00:00

titlebar.c

Refactored setting window recipient

2014-01-11 18:06:46 +00:00

ui.h

Added /otr trust|untrust commands

2014-01-12 01:20:22 +00:00

window.c

Merge branch 'master' into otr

2014-01-12 01:25:35 +00:00

window.h

Added /otr theirfp with hardcoded fingerprint

2014-01-11 19:10:00 +00:00

windows.c

Added simple mock test, refactored roster

2013-12-14 15:34:17 +00:00

windows.h

Added simple mock test, refactored roster

2013-12-14 15:34:17 +00:00