# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1509668273 -3600
# Node ID e08a0ff6ce14885f875d17e7e5f8dc608934afa5
# Parent  60eb22fd21b86cfd57590bdc2aed4c57da844573# Parent  3629639d5fa9202b71e3801e405a2f35c8d54ddb
Merge 0.10->trunk

diff -r 60eb22fd21b8 -r e08a0ff6ce14 util/termcolours.lua
--- a/util/termcolours.lua	Fri Nov 03 01:13:35 2017 +0100
+++ b/util/termcolours.lua	Fri Nov 03 01:17:53 2017 +0100
@@ -30,7 +30,8 @@
 local stylemap = {
 			reset = 0; bright = 1, dim = 2, underscore = 4, blink = 5, reverse = 7, hidden = 8;
 			black = 30; red = 31; green = 32; yellow = 33; blue = 34; magenta = 35; cyan = 36; white = 37;
-			["black background"] = 40; ["red background"] = 41; ["green background"] = 42; ["yellow background"] = 43; ["blue background"] = 44; ["magenta background"] = 45; ["cyan background"] = 46; ["white background"] = 47;
+			["black background"] = 40; ["red background"] = 41; ["green background"] = 42; ["yellow background"] = 43;
+			["blue background"] = 44; ["magenta background"] = 45; ["cyan background"] = 46; ["white background"] = 47;
 			bold = 1, dark = 2, underline = 4, underlined = 4, normal = 0;
 		}