Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:30:27 +0000 (12:30 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:30:27 +0000 (12:30 +0100)
1  2 
init.cpp

diff --cc init.cpp
Simple merge