Merge branch 'sg/complete-configuration-variables'

diff --git a/git.rc b/git.rc
index 49002e0d541f1ab080efd8b9b4732f52db89e984..cc3fdc6cc6cb83b084eebe2ad49f3c78c981789b 100644 (file)
--- a/git.rc
+++ b/git.rc
@@ -20,3 +20,5 @@ BEGIN
     VALUE "Translation", 0x409, 1200
   END
 END
+
+1 RT_MANIFEST "compat/win32/git.manifest"