summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-06-21 21:45:48 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-06-21 21:45:48 +0200
commit445d92dbb16d443e201f3a7ac73d4fa5ba6c2697 (patch)
tree781e215cd9bee532b04dd9442b577361277c19e3
parent85dba966adf31020925852daf6f8f8c1b3906435 (diff)
parent679f9ca3a07533b9c89401d3093d569293e29cc5 (diff)
Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner
-rw-r--r--.gitignore1
m---------wriggle0
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d37d620..62fc708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
.sconsign.dblite
config.log
/foo
+libengine.a
diff --git a/wriggle b/wriggle
-Subproject d6b9953c32b9abc2a96bb2e5b82d8801a1d12ce
+Subproject 95adcb33f1e5cbc12afe22ed83b3b5c7f30fc4f