summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-04-29 15:04:45 -0700
committerPhilipp Gesang <phg42.2a@gmail.com>2013-04-29 15:04:45 -0700
commit202f064c65283e482f149868437e2881a73ebe3d (patch)
treeb31b5a94146a0a300b3fd09cb50d5736a002f086 /.gitignore
parent5ff06a36a0e82f3350bc955fac3825d7a1969289 (diff)
parent1e04ecc2c4918448e8ff30a2e6363025267cac79 (diff)
downloadlualibs-202f064c65283e482f149868437e2881a73ebe3d.tar.gz
Merge pull request #2 from phi-gamma/master
merge experimental branch
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1fcf771
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+testing/*
+*-merged.lua