aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-11-02 16:26:46 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-11-02 16:26:46 -0800
commit7dab40dc51a8205402e32d13b2c5c49c03a44b4d (patch)
treef44f73f0c58c36178b8a64f33f1120fe375caed9 /.gitignore
parent601908591b553b87901bb1122ff4e29d1decd6b1 (diff)
parentf4702fd1d57273b86d0510ce14c6db1a5372f4b4 (diff)
Merge branch 'master' into cmake
Conflicts: .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e4f3b65..f3c4dcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,6 @@
scanners.c
*.zip
bstrlib.txt
-commonmark.dSYM/*
-commonmark
build
+cmark.dSYM/*
+cmark