Merge branch 'rr1-maint'
commit2004486a1ef102cbc790a78536eaba140639529b
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 28 Feb 2013 19:18:19 +0000 (28 21:18 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 28 Feb 2013 19:18:19 +0000 (28 21:18 +0200)
tree5bc1445b9230eb7d9ed3cde039701309cecf7b7a
parentff8e220fb72663426d4255bd8d22608c294ac234
parentaa9881278e40f1ff30afa9de92f6bbc778f2949a
Merge branch 'rr1-maint'
src/library/framebuffer.cpp