Fix merge snafu in last commit. (Oops.)
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 20 Apr 2013 14:41:18 +0000 (16:41 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 20 Apr 2013 14:41:18 +0000 (16:41 +0200)
commitef7f588a9b7a63ba2153cd06ce5322db4453fa16
tree77edebc7cebf878de8952c8246c892c09f6a509d
parent6d72705df23fbdb0eccb085ff984cd93c38e4166
Fix merge snafu in last commit. (Oops.)
stream.cpp