Merge branch 'epoxy' of ssh://pannekake.samfundet.no/srv/git.sesse.net/www/movit...
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 11:41:46 +0000 (12:41 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 11:41:46 +0000 (12:41 +0100)
commit34036d849937f22c0addfcba44f65207c96deddc
tree9cdb7d5e00c1730e760af27ea8169321e491e6ad
parentf332ac28f6a5255a6908c29124589148a8a5b2c5
parentfe36cdba16b02cab582f2d0516e98fcdb62f3807
Merge branch 'epoxy' of ssh://pannekake.samfundet.no/srv/git.sesse.net/www/movit into epoxy
init.cpp