Craig Tiller 897e4fe2ad Update copyrights 10 gadi atpakaļ
..
build f96dfc3cf8 First round of fixing up implicit 64->32 bit conversions 10 gadi atpakaļ
core 897e4fe2ad Update copyrights 10 gadi atpakaļ
cpp 5ff97a27a9 Merge pull request #4479 from ctiller/aarons-bug 10 gadi atpakaļ
proto d88e1d8f4e merge with head and resolve conflict 10 gadi atpakaļ