Merge branch 'master' into winbuffers

This commit is contained in:
James Booth
2014-07-17 00:30:18 +01:00
5 changed files with 5 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ gone=blue
error=white
incoming=white
roominfo=white
roommention=white
me=white
them=cyan
titlebar.unencrypted=cyan

View File

@@ -23,6 +23,7 @@ gone=red
error=red
incoming=yellow
roominfo=green
roommention=cyan
me=black
them=yellow
titlebar.unencrypted=red

View File

@@ -23,6 +23,7 @@ gone=green
error=red
incoming=green
roominfo=green
roommention=green
me=green
them=green
titlebar.unencrypted=black

View File

@@ -23,6 +23,7 @@ gone=red
error=red
incoming=yellow
roominfo=yellow
roommention=yellow
me=yellow
them=green
titlebar.unencrypted=red

View File

@@ -23,6 +23,7 @@ gone=red
error=red
incoming=yellow
roominfo=green
roommention=red
me=green
them=yellow
titlebar.unencrypted=red