about summary refs log tree commit diff stats
path: root/profanity.spec
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-12 01:12:42 +0000
committerJames Booth <boothj5@gmail.com>2015-01-12 01:12:42 +0000
commit0d0ed9b7ca4b9055fece7ddc4e2430b900cbb355 (patch)
treee25b30c13981503ac96b85f6514a40eab98279b1 /profanity.spec
parentc64484c6ed8ab38b840786d76e986cf622d56ece (diff)
parent22cc641905fcb6f321653a2826ef588d4cece223 (diff)
downloadprofani-tty-0d0ed9b7ca4b9055fece7ddc4e2430b900cbb355.tar.gz
Merge remote-tracking branch 'incertia/exit-title'
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
Diffstat (limited to 'profanity.spec')
0 files changed, 0 insertions, 0 deletions