1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
profanity/src/ui
James Booth 00fd7f4bce Merge branch 'master' into plugins
Conflicts:
	src/ui/window.h
	src/ui/windows.c
2014-04-15 23:48:59 +01:00
..
console.c Merge branch 'master' into plugins 2014-04-13 22:21:13 +01:00
core.c Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
inputwin.c Merge branch 'master' into plugins 2014-04-07 21:58:15 +01:00
inputwin.h Removed inputwin functions from ui.h 2014-04-07 21:50:28 +01:00
notifier.c Merge branch 'master' into plugins 2014-04-02 22:53:35 +01:00
statusbar.c Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
statusbar.h Tidied new headers, added defines 2014-04-07 21:19:35 +01:00
titlebar.c Merge branch 'master' into plugins 2014-04-07 21:58:15 +01:00
titlebar.h Tidied new headers, added defines 2014-04-07 21:19:35 +01:00
ui.h Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
window.c Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
window.h Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
windows.c Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00
windows.h Merge branch 'master' into plugins 2014-04-15 23:48:59 +01:00