Merge branch 'release/0.3.4'

This commit is contained in:
Jason Paryani 2013-08-22 17:48:48 -07:00
commit fe475df34c
3 changed files with 7 additions and 7 deletions

View file

@ -9,7 +9,7 @@ ctypedef unsigned int uint
cdef extern from "capnp/common.h" namespace " ::capnp":
enum Void:
VOID " ::capnp::Void::VOID"
VOID " ::capnp::VOID"
cdef extern from "kj/string.h" namespace " ::kj":
cdef cppclass StringPtr:

View file

@ -17,11 +17,11 @@ struct Person {
}
}
employment @4 union {
unemployed @5 :Void;
employer @6 :Text;
school @7 :Text;
selfEmployed @8 :Void;
employment :union {
unemployed @4 :Void;
employer @5 :Text;
school @6 :Text;
selfEmployed @7 :Void;
# We assume that a person is only one of these.
}
}

View file

@ -13,7 +13,7 @@ import os
MAJOR = 0
MINOR = 3
MICRO = 3
MICRO = 4
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)