diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-08 10:49:33 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-08 10:49:33 +0200 |
| commit | 471f9a8dba225921cf1a555ad6645305a860c7fb (patch) | |
| tree | e2202f0ab72e09467b0d2a15afd8bfafc9b5fae5 /.gitignore | |
| parent | 145332cc9b4e5af62299dedf45c436fedbe05fec (diff) | |
| parent | 8d39fbdb4980c95268249f21f3c6b8e36b22cf90 (diff) | |
Merge branch 'develop' into release-0.9.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -58,7 +58,6 @@ openvpn/libtool openvpn/stamp-h1 openvpn/version.sh t_client.sh -ics-openvpn.zip zh-CN.zip zh-TW.zip google-breakpad/ @@ -76,8 +75,6 @@ build .gradle jniLibs *.dot -/ics-openvpn/ /TAGS -/ics-openvpn /ics-openvpn-stripped app/ovpnlibs |