James Booth 9fad03af74 Merge branch 'master' into inp-utf8 ...

Conflicts:
	src/ui/inputwin.c

2015-01-16 00:41:02 +00:00

..

buffer.c

Replaced colours with theme_item_t

2014-11-16 20:40:19 +00:00

buffer.h

Replaced colours with theme_item_t

2014-11-16 20:40:19 +00:00

console.c

Show eval_password if exists on /account show

2015-01-13 00:51:21 +00:00

core.c

Renamed inp_get_char->inp_read

2015-01-15 23:46:54 +00:00

inputwin.c

Merge branch 'master' into inp-utf8

2015-01-16 00:41:02 +00:00

inputwin.h

Renamed inp_get_char->inp_read

2015-01-15 23:46:54 +00:00

notifier.c

Moved remimder notification code out of main loop

2015-01-15 00:42:40 +00:00

occupantswin.c

Removed function pointers

2014-12-22 22:13:42 +00:00

rosterwin.c

Removed function pointers

2014-12-22 22:13:42 +00:00

statusbar.c

Replaced colours with theme_item_t

2014-11-16 20:40:19 +00:00

statusbar.h

Added license exemption for OpenSSL to source headers

2014-08-24 20:57:39 +01:00

titlebar.c

Added preferences for showing resource in titlebar and messages

2015-01-10 19:10:10 +00:00

titlebar.h

Added win_get_title

2014-12-21 22:01:56 +00:00

ui.h

Moved input line to inputwin

2015-01-15 23:43:22 +00:00

window.c

Moved win_handle_page to window module

2015-01-15 00:14:12 +00:00

window.h

Moved win_handle_page to window module

2015-01-15 00:14:12 +00:00

windows.c

Removed functions from windows.c

2014-12-22 00:28:03 +00:00

windows.h

Removed functions from windows.c

2014-12-22 00:28:03 +00:00