summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-03-08 18:42:37 -0500
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-03-08 18:42:37 -0500
commit0f104084d79593ea001cacb36afd91937c894a54 (patch)
treeeb5d5435333e9f1ed5c84674731cb2ed6b4e2064
parent78be402aef3904ff557f49946b77db5f02cbea1c (diff)
parentecf3367ba8afbc5438d01f55bf3c7516faa7a157 (diff)
Merge branch 'master' of http://micah.riseup.net/git/monkeysphere
-rw-r--r--Makefile2
-rw-r--r--micahschange0
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index eb82821..f3576b1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,3 +3,5 @@ monkeysphere: main.c
clean:
rm monkeysphere
+
+.PHONY: clean
diff --git a/micahschange b/micahschange
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/micahschange