projects / feisty_meow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 120c7cc)
Merge branch 'dev' of ssh://git.code.sf.net/p/feistymeow/trunk into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 16 Oct 2018 00:58:15 +0000 (00:58 +0000)
committerChris Koeritz <fred@gruntose.com>
Tue, 16 Oct 2018 00:58:15 +0000 (00:58 +0000)
more merging.  wheee.

.dev_bran [new file with mode: 0644] patch | blob

diff --git a/.dev_bran b/.dev_bran
new file mode 100644 (file)
index 0000000..e91d326
--- /dev/null
+++ b/.dev_bran
@@ -0,0 +1,2 @@
+
+tickling a check-in