From 44bee4cf29af49186c8710837d715f8ab26f3311 Mon Sep 17 00:00:00 2001
From: Brian Schott <briancschott@gmail.com>
Date: Fri, 18 Jul 2014 14:56:57 -0700
Subject: [PATCH 1/2] Update README.md

D-Scanner hasn't provided auto-complete in ages...
---
 editors/vim/README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/editors/vim/README.md b/editors/vim/README.md
index a8cf81a..ecb28d6 100644
--- a/editors/vim/README.md
+++ b/editors/vim/README.md
@@ -42,6 +42,7 @@ Be sure that the following option is set in your .vimrc:
 ```vim
 set omnifunc=syntaxComplete#complete
 ```
+If you do not do this, omni-complete will not know to use DCD.
 
 Usage
 =====
@@ -67,11 +68,6 @@ under the cursor.
 When the server is running, use the `DCDsymbolLocation` to print jump to the
 declaration of the symbol under the cursor.
 
-Conflicts
-=========
-This plugin conflicts with the DScanner plugin, as both use the `dcomplete`
-autoload namespace and the `dcomplete#Complete` function - as per Vim's
-conventions.
 
 Configuration
 =============

From e12d0cea5aac85bd2d11a31e45783bc701793505 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Wed, 23 Jul 2014 18:31:27 -0700
Subject: [PATCH 2/2] Fix doc comment

---
 modulecache.d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulecache.d b/modulecache.d
index 5d13a84..67160a4 100644
--- a/modulecache.d
+++ b/modulecache.d
@@ -194,7 +194,7 @@ struct ModuleCache
 
 	/**
 	 * Params:
-	 *     moduleName the name of the module being imported, in "a/b/c" style
+	 *     moduleName = the name of the module being imported, in "a/b/c" style
 	 * Returns:
 	 *     The absolute path to the file that contains the module, or null if
 	 *     not found.