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)
commitaf679f1cc71bf3b06f91a0d5fa5541f93b76e461
treecfd1fa1e69f47704212150bbe8ffdedb3682552b
parent1e9bdf652b42a65c1a4aadee99a303979ae6469c
hmm conflict not merged right. fix.

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