From a2a03e83609a570428d0dce35ef649353b5796aa Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 九月 2019 11:44:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

---
 .gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9e98b7..8331c37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 *.app
 
 /build
+.idea
+.vscode

--
Gitblit v1.8.0