From: martin f. krafft Date: Sat, 2 Nov 2019 09:41:23 +0000 (+1300) Subject: Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3' X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/66d9f3db4596e43efa55488569e06365a2125750?ds=sidebyside;pf=etc Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3' --- 66d9f3db4596e43efa55488569e06365a2125750 diff --cc .config/awesome/lain/icons/cal/black/1.png index 0000000,d2fb62e..d2fb62e mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/10.png index 0000000,507b079..507b079 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/11.png index 0000000,336141b..336141b mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/12.png index 0000000,c589729..c589729 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/13.png index 0000000,377518b..377518b mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/14.png index 0000000,6f4a9fe..6f4a9fe mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/15.png index 0000000,1a271c1..1a271c1 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/16.png index 0000000,5e65835..5e65835 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/17.png index 0000000,f3fa0a9..f3fa0a9 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/18.png index 0000000,7acb37a..7acb37a mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/19.png index 0000000,a557957..a557957 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/2.png index 0000000,17b33e0..17b33e0 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/20.png index 0000000,558d111..558d111 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/21.png index 0000000,0bbedc8..0bbedc8 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/22.png index 0000000,762d262..762d262 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/23.png index 0000000,a39dcee..a39dcee mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/24.png index 0000000,c00dbca..c00dbca mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/25.png index 0000000,dc9243c..dc9243c mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/26.png index 0000000,50bb182..50bb182 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/27.png index 0000000,0fbf9fc..0fbf9fc mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/28.png index 0000000,def6ab2..def6ab2 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/29.png index 0000000,531923c..531923c mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/3.png index 0000000,98b552d..98b552d mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/30.png index 0000000,ca58151..ca58151 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/31.png index 0000000,6e8da21..6e8da21 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/4.png index 0000000,4335979..4335979 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/5.png index 0000000,576ec11..576ec11 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/6.png index 0000000,56fa8ab..56fa8ab mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/7.png index 0000000,7c90b3a..7c90b3a mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/8.png index 0000000,9d1f28e..9d1f28e mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/black/9.png index 0000000,00d0933..00d0933 mode 000000,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/1.png index 90b696c,a0faa20..a0faa20 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/10.png index b462ffb,7d9343b..7d9343b Binary files differ diff --cc .config/awesome/lain/icons/cal/white/11.png index cf43296,7af5e99..7af5e99 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/12.png index 42cf092,b164f85..b164f85 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/13.png index 37db670,fef74f3..fef74f3 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/14.png index 0188504,d747a6b..d747a6b Binary files differ diff --cc .config/awesome/lain/icons/cal/white/18.png index 817c426,0cf1c24..0cf1c24 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/19.png index 0e6dafc,bfd3530..bfd3530 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/2.png index b93789a,e7f3fa4..e7f3fa4 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/20.png index 3d8d7c6,9a5a1fb..9a5a1fb Binary files differ diff --cc .config/awesome/lain/icons/cal/white/21.png index 79a74f3,266ab9f..266ab9f Binary files differ diff --cc .config/awesome/lain/icons/cal/white/22.png index e8845ce,f486289..f486289 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/23.png index a8d4dfb,244dceb..244dceb Binary files differ diff --cc .config/awesome/lain/icons/cal/white/24.png index 1a3b38a,0ce1c75..0ce1c75 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/25.png index c3621b7,48d279c..48d279c Binary files differ diff --cc .config/awesome/lain/icons/cal/white/26.png index f26731b,7535855..7535855 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/27.png index e4dde77,2aa9074..2aa9074 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/28.png index b924c22,0201976..0201976 Binary files differ diff --cc .config/awesome/lain/icons/cal/white/29.png index e9a74f8,9305b9b..9305b9b Binary files differ diff --cc .config/awesome/lain/icons/cal/white/3.png index 1124271,f1eb5de..f1eb5de Binary files differ diff --cc .config/awesome/lain/icons/cal/white/30.png index 8147d78,1ba61aa..1ba61aa Binary files differ diff --cc .config/awesome/lain/icons/cal/white/31.png index a1be3e8,e9a873b..e9a873b Binary files differ diff --cc .config/awesome/lain/icons/cal/white/4.png index 16713bc,ee1ed6a..ee1ed6a Binary files differ diff --cc .config/awesome/lain/icons/cal/white/6.png index a1c9798,0a7bf4d..0a7bf4d Binary files differ diff --cc .config/awesome/lain/icons/cal/white/8.png index 909b726,cb03d0b..cb03d0b Binary files differ diff --cc .config/awesome/lain/icons/cal/white/9.png index dc636c4,fca554a..fca554a Binary files differ diff --cc .config/awesome/lain/icons/layout/default/cascadetile.png index 2f12ada,ba30f43..ba30f43 Binary files differ diff --cc .config/awesome/lain/icons/layout/default/cascadetilew.png index c46b48b,d15eb70..d15eb70 Binary files differ diff --cc .config/awesome/lain/icons/layout/default/centerwork.png index 826b331,51e06bc..51e06bc Binary files differ diff --cc .config/awesome/lain/icons/layout/default/centerworkh.png index 4fb4fdd,c59092f..c59092f Binary files differ diff --cc .config/awesome/lain/icons/layout/default/centerworkhw.png index fd27766,7820f8c..7820f8c Binary files differ diff --cc .config/awesome/lain/icons/layout/default/centerworkw.png index fcfa7e3,85e6996..85e6996 Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/cascade.png index 532842d,fbe4fac..fbe4fac Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/cascadetile.png index 87be658,2e03a80..2e03a80 Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/centerfair.png index 01cda8e,75dc993..75dc993 Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/centerwork.png index 6a2cecc,af7a863..af7a863 Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/centerworkh.png index 00beeb5,88019b3..88019b3 Binary files differ diff --cc .config/awesome/lain/icons/layout/zenburn/termfair.png index b7d5880,f7640b5..f7640b5 Binary files differ diff --cc .config/awesome/lain/icons/mail.png index 60ba6e0,9c0c7a3..9c0c7a3 Binary files differ diff --cc .config/awesome/lain/icons/no_net.png index 1a3e8a8,3613372..3613372 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/01d.png index d9e2745,569965e..569965e mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/01n.png index 84ea140,ce5b135..ce5b135 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/02d.png index 8fd0a5b,2ba9799..2ba9799 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/02n.png index 9e4404d,12e4283..12e4283 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/03d.png index 22b929c,1cf0e9d..1cf0e9d mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/03n.png index d8b3673,89a42b8..89a42b8 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/04d.png index bac1e7e,e7fb67f..e7fb67f mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/09d.png index d00552a,cfa066a..cfa066a mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/10d.png index 3cc6665,712d0c8..712d0c8 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/11d.png index d30e120,3b62f7c..3b62f7c mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/13d.png index ddcb8f3,e265b01..e265b01 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/50d.png index 009039f,905ace3..905ace3 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/openweathermap/na.png index 62a5350,1cc5132..1cc5132 mode 100755,100644..100644 Binary files differ diff --cc .config/awesome/lain/icons/taskwarrior.png index 859ca29,c64fe86..c64fe86 Binary files differ diff --cc .config/awesome/lain/lain-scm-1.rockspec index 0000000,fb1eaaf..fb1eaaf mode 000000,100644..100644 --- a/.config/awesome/lain/lain-scm-1.rockspec +++ b/.config/awesome/lain/lain-scm-1.rockspec diff --cc .config/awesome/lain/util/menu_iterator.lua index 0000000,9959b25..9959b25 mode 000000,100644..100644 --- a/.config/awesome/lain/util/menu_iterator.lua +++ b/.config/awesome/lain/util/menu_iterator.lua diff --cc .config/awesome/lain/widget/cal.lua index 0000000,928a7bd..928a7bd mode 000000,100644..100644 --- a/.config/awesome/lain/widget/cal.lua +++ b/.config/awesome/lain/widget/cal.lua diff --cc .config/awesome/lain/widget/contrib/tp_smapi.lua index 0000000,b8acbe2..b8acbe2 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/tp_smapi.lua +++ b/.config/awesome/lain/widget/contrib/tp_smapi.lua diff --cc .config/awesome/lain/widget/pulse.lua index 0000000,f63fe55..f63fe55 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/pulse.lua +++ b/.config/awesome/lain/widget/pulse.lua