Merge pull request #166 from gaborigloi/update_merlin

Update .merlin file

.merlin

@@ -1,18 +1,30 @@
-PKG cmdliner cohttp fd-send-recv message_switch.unix lwt.unix oUnit rpclib.syntax re sexplib.syntax uri xapi-backtrace unix xcp-inventory xmlm
+PKG cmdliner
+PKG cohttp
+PKG fd-send-recv
+PKG lwt
+PKG message_switch
+PKG oUnit
+PKG ppx_deriving_rpc
+PKG ppx_sexp_conv
+PKG re
+PKG rpclib
+PKG rrd
+PKG sexplib
+PKG threads
+PKG unix
+PKG uri
+PKG xapi-backtrace
+PKG xmlm
+B +threads
+
+B _build/**
+
 S example
 S lib
 S lib_test
 S memory
 S network
 S rrd
 S storage
+S v6
 S xen
-
-B _build/example
-B _build/lib
-B _build/lib_test
-B _build/memory
-B _build/network
-B _build/rrd
-B _build/storage
-B _build/xen