Merge branch 'rbtree'

Conflicts: third_party/README

Merge branch 'rbtree'
6ec5b551 · Konstantin Osipov · 52765de6 · fb49adc8 · 6ec5b551 · 6ec5b551
Commit 6ec5b551 authored 12 years ago by Konstantin Osipov
--- a/third_party/README
+++ b/third_party/README
@@ -45,3 +45,8 @@ Note: we have two important changes to the stock libeio:
  work.

 Otherwise: cvs up
+
+How to update rb.h
+======================
+Get the header from
+git://canonware.com/jemalloc.git
--- a/third_party/rb.h
+++ b/third_party/rb.h
--- a/third_party/tree.h
+++ b/third_party/tree.h