[##UnknownPlayer##]

EDIT: I've fixed the bug which was causing problems with the DX merge. As of this moment its officially functional and can be added to modded etc as a normal part of the fs2_open main line.
You probably need to check some of your functions and such since they may have been waxed by the merge (OpenGL people might really want to check out there initialization code [RunGLTest was removed - do you need it?]). But as of right now the CVS copy of fs2_open has had DX merged in and is running the game.

If you encounter any bugs, post them on this thread or the other DX merge thread.

[phreak]

IIRC, RunGLTest was ripped out

[Inquisitor]

Well, the good thing, is all the files are still there, so work wasn't "lost."

So, anything prior to 11pm or Midnight EST we can retrieve comfortably.

What else got nerfed, if anything?

[##UnknownPlayer##]

I'm not sure at this point. I'm just going to have to wait for people claiming they can't find features since I haven't been heavily following whats been going into the main branch.

[Inquisitor]

Well, if phreak, bob, dtp and others will spot check the code...