hmm conflict not merged right. fix.
authorCarsten Haitzler <raster@rasterman.com>
Fri, 10 Jun 2011 07:08:34 +0000 (07:08 +0000)
committerCarsten Haitzler <raster@rasterman.com>
Fri, 10 Jun 2011 07:08:34 +0000 (07:08 +0000)
commitbd9b9fa2b70d7bb91d36301cde24d25ef6a441ac
treee3f2f384c3314402c7697a3ea1c46fec32d7b9cf
parent2c69f4710c8b0a1f5bcacace51286430dfc526a5
hmm conflict not merged right. fix.

SVN revision: 60177
src/bin/test_box.c
src/lib/elm_win.c