Merge branch 'develop'

the1ts · Jan 12, 2022 · be7ff4a · be7ff4a
2 parents 1684772 + 205db2c
commit be7ff4a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,14 +1,6 @@
-[submodule "gina"]
-	path = actions/gina
-	url = https://github.com/todotxt/todo.txt-cli.git/
-	branch = addons
 [submodule "smajda"]
 	path = actions/smajda
 	url = https://github.com/smajda/todo.actions.d/
 [submodule "drobertadams"]
 	path = actions/drobertadams
     url = https://github.com/drobertadams/todo.txt-cli-addons.git
-[submodule "actions/nthorne"]
-	path = actions/nthorne
-	url = git@github.com:nthorne/todo.txt-cli-again-addon.git
-	branch = AgainAsDo
diff --git a/GEN-VERSION-FILE b/GEN-VERSION-FILE
@@ -2,7 +2,7 @@
 # Based on git's GIT-VERSION-GEN.
 
 VF=VERSION-FILE
-DEF_VER=v2.4.1
+DEF_VER=v2.4.1.1
 
 LF='
 '

diff --git a/Makefile b/Makefile
@@ -22,7 +22,6 @@ READMEFILES := README.*
 DISTNAME=todo.txt_plugins-$(VERSION)
 dist: $(DISTFILES) 
 	mkdir -p $(DISTNAME)/docs/
-	cp -rf README $(DISTNAME)/
 	cp -rf $(DISTFILES) $(DISTNAME)/
 	cp -rf $(READMEFILES) $(DISTNAME)/docs
 	tar cf $(DISTNAME).tar $(DISTNAME)/

diff --git a/actions/gina b/actions/gina
diff --git a/actions/nthorne b/actions/nthorne