Skip to content

Commit

Permalink
Merge branch 'patch-1' of git://github.com/heidi-ann/ocaml-dns into h…
Browse files Browse the repository at this point in the history
…eidi-ann-patch-1

Conflicts:
	.travis-ci.sh
  • Loading branch information
avsm committed Mar 29, 2015
2 parents 5a2a640 + a2f7e0a commit e91a40b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/mirage/ocaml-dns.svg?branch=master)](https://travis-ci.org/mirage/ocaml-dns)

This is a pure OCaml implementation of the DNS protocol. It is intended to be
a reasonably high-performance implementation, but clarity is preferred rather
than low-level performance hacks.
Expand Down

0 comments on commit e91a40b

Please sign in to comment.