From 8ea89a0d97e91c856edc23301db065d5986af5a4 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <elv1313@gmail.com>
Date: Tue, 22 Apr 2014 22:19:25 -0400
Subject: [PATCH] Merge the fallback branch

---
 init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.lua b/init.lua
index 03ebd53..1a37f9a 100755
--- a/init.lua
+++ b/init.lua
@@ -11,7 +11,7 @@ local capi = {client = client , tag    = tag   , awesome = awesome,
 
 local signals,module,class_client,tags_hash,settings,sn_callback,fallbacks,prop = {
   "exclusive"   , "init"      , "volatile"  , "focus_new" , "instances"        ,
-  "match"       , "class"     , "spawn"     , "position"  , "force_screen"     ,
+  "locked"      , "class"     , "spawn"     , "position"  , "force_screen"     ,
   "max_clients" , "exec_once" , "clone_on"  , "clone_of"  , "no_focus_stealing",
   "fallback"    , "no_focus_stealing_out","no_focus_stealing_in"
 },{},{},{},{},{},{},awful.tag.getproperty