Merge branch 'en/t7405-recursive-submodule-conflicts'
[gitweb.git] / negotiator /
drwxr-xr-x   parent (dest: ; base: c99033060ff7511864e404c18040ffa236f81404)
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h