Merge pull request #40 from FreeBirdLjj/issue#16
authorMichael Göhler <somebody.here@gmx.de>
Tue, 30 Sep 2014 10:55:38 +0000 (12:55 +0200)
committerMichael Göhler <somebody.here@gmx.de>
Tue, 30 Sep 2014 10:55:38 +0000 (12:55 +0200)
Add sublime Text 3 project settings.
Replace ((void*)0) with NULL.
Add inline_display().
Update for inline markdown support of unordered list.
Support for inline markdown in unordered list.
Use for loop to iterate.
Remove unused block.

1  2 
Makefile
include/viewer.h
mdp.sublime-project
src/viewer.c

diff --cc Makefile
Simple merge
Simple merge
index 0000000,17711a0..e20eca6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,15 +1,16 @@@
 -      "settings":
 -      {
 -              "tab_size": 4,
 -              "translate_tabs_to_spaces": true,
 -              "use_tab_stops": false,
 -      }
 -      ,"folders":
 -      [
 -      {
 -              "follow_symlinks": true,
 -              "path": "."
 -      }
 -      ]
 -}
+ {
++    "settings":
++    {
++        "tab_size": 4,
++        "translate_tabs_to_spaces": true,
++        "use_tab_stops": false
++    }
++    ,"folders":
++    [
++    {
++        "follow_symlinks": true,
++        "path": ".",
++        "file_exclude_patterns": [".*", "mdp", "mdp.sublime-project"]
++    }
++    ]
++}
diff --cc src/viewer.c
Simple merge