summaryrefslogtreecommitdiff
path: root/doc/extdev
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:42:53 +0400
committerDmitry Shachnev <mitya57@gmail.com>2014-01-22 18:42:53 +0400
commitdb07af36867c5da22160637cd535d32d20d69d28 (patch)
tree7c10de2dfaa41b0e2316d8618bb9fe885810adef /doc/extdev
parentf672d4f39378568370400a488cbe846448bc37ab (diff)
downloadsphinx-db07af36867c5da22160637cd535d32d20d69d28.tar.gz
Resolve some conflicts
Diffstat (limited to 'doc/extdev')
0 files changed, 0 insertions, 0 deletions