aboutsummaryrefslogtreecommitdiff
path: root/nxproxy
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-18 00:06:30 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-18 00:06:30 +0100
commitedeca4affd92f5eea4595d06f36ba8bb2c149831 (patch)
treeef5f975fec842de99d777842806c2925c6699cb4 /nxproxy
parent1f60704371940a34c51c1badad7de1a22aba5fb7 (diff)
parent7993d28f1d4cd835980d81993bf53854441a6705 (diff)
downloadnx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.tar.gz
nx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.tar.bz2
nx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.zip
Merge branch 'uli42-pr/gitignore' into 3.6.x
Attributes GH PR #280: https://github.com/ArcticaProject/nx-libs/pull/280
Diffstat (limited to 'nxproxy')
-rw-r--r--nxproxy/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/nxproxy/.gitignore b/nxproxy/.gitignore
new file mode 100644
index 000000000..3d98254b2
--- /dev/null
+++ b/nxproxy/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+nxproxy