Smoke: compile error due to bad merged conflicts
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 30 Jul 2009 20:18:28 +0000 (20:18 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 30 Jul 2009 20:18:28 +0000 (20:18 +0000)
commit0d45058867d39355b551931c0870f69a21bae8ae
tree3b7132ace37ba2654cdeeb4a943dffe8cb69b9fd
parentdbba273371ff3e827f5b3cfc0aaf967222188611
Smoke: compile error due to bad merged conflicts
intern/smoke/extern/smoke_API.h