From: ken <ken@mihrtec.com>
Date: Fri, 14 Oct 2016 21:56:43 +0000 (-0700)
Subject: merge
X-Git-Url: https://git.kengrimes.com/?p=henge%2Fwebcc.git;a=commitdiff_plain;h=862bda90d3776a7e4a2045cef73a5f996f449763;hp=5204a4831d3ed34270d5fbb260aece8194c859e5

merge
---

diff --git a/.gitignore b/.gitignore
index cae20fd..610b584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.[oa]
 *.bc
-*~
-*/#*#
+*[~#]
+.#*
 bin/*
 extern/*
 proto/*