[go: up one dir, main page]
Menu ▾ ▴

Commit [r12367]  Maximize  Restore  History

Merging techniques branch into trunk :-D

Was a bit messy, I hope I didn't break anything

klaussfreire 2008-06-16

Browse code at this revision

Parent: [r12366]

Child: [r12368]

1 2 3 4 > >> (Page 1 of 4)
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Converter.cpp -> /trunk/vegastrike/objconv/mesher/Converter.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Converter.h -> /trunk/vegastrike/objconv/mesher/Converter.h
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules -> /trunk/vegastrike/objconv/mesher/Modules
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/BFXM_to_Wavefront.cpp -> /trunk/vegastrike/objconv/mesher/Modules/BFXM_to_Wavefront.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/BFXM_to_XMesh.cpp -> /trunk/vegastrike/objconv/mesher/Modules/BFXM_to_XMesh.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Convert.cpp -> /trunk/vegastrike/objconv/mesher/Modules/Convert.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Dims.cpp -> /trunk/vegastrike/objconv/mesher/Modules/Dims.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/OldSyntax.cpp -> /trunk/vegastrike/objconv/mesher/Modules/OldSyntax.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Wavefront_to_BFXM.cpp -> /trunk/vegastrike/objconv/mesher/Modules/Wavefront_to_BFXM.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/Modules/XMesh_to_BFXM.cpp -> /trunk/vegastrike/objconv/mesher/Modules/XMesh_to_BFXM.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders -> /trunk/vegastrike/objconv/mesher/PrecompiledHeaders
copied /branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.cpp -> /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.cpp
copied /branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.h -> /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.h
copied /branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Standard.h -> /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Standard.h
copied /branches/gfxtechniques/vegastrike/objconv/mesher/main.cpp -> /trunk/vegastrike/objconv/mesher/main.cpp
changed /trunk/vegastrike/Makefile.am
changed /trunk/vegastrike/configure.ac
removed /trunk/vegastrike/objconv/mesher/converter.cpp
changed /trunk/vegastrike/objconv/mesher/from_BFXM.cpp
changed /trunk/vegastrike/objconv/mesher/from_BFXM.h
changed /trunk/vegastrike/objconv/mesher/from_obj.cpp
changed /trunk/vegastrike/objconv/mesher/mesh_io.h
changed /trunk/vegastrike/objconv/mesher/to_BFXM.cpp
changed /trunk/vegastrike/objconv/mesher/to_BFXM.h
changed /trunk/vegastrike/objconv/mesher/to_OgreMesh.cpp
/branches/gfxtechniques/vegastrike/objconv/mesher/Converter.cpp to /trunk/vegastrike/objconv/mesher/Converter.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Converter.h to /trunk/vegastrike/objconv/mesher/Converter.h
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules to /trunk/vegastrike/objconv/mesher/Modules
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/BFXM_to_Wavefront.cpp to /trunk/vegastrike/objconv/mesher/Modules/BFXM_to_Wavefront.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/BFXM_to_XMesh.cpp to /trunk/vegastrike/objconv/mesher/Modules/BFXM_to_XMesh.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Convert.cpp to /trunk/vegastrike/objconv/mesher/Modules/Convert.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Dims.cpp to /trunk/vegastrike/objconv/mesher/Modules/Dims.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/OldSyntax.cpp to /trunk/vegastrike/objconv/mesher/Modules/OldSyntax.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/Wavefront_to_BFXM.cpp to /trunk/vegastrike/objconv/mesher/Modules/Wavefront_to_BFXM.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/Modules/XMesh_to_BFXM.cpp to /trunk/vegastrike/objconv/mesher/Modules/XMesh_to_BFXM.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders to /trunk/vegastrike/objconv/mesher/PrecompiledHeaders
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.cpp to /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.cpp
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.h to /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Converter.h
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/PrecompiledHeaders/Standard.h to /trunk/vegastrike/objconv/mesher/PrecompiledHeaders/Standard.h
File was copied.
/branches/gfxtechniques/vegastrike/objconv/mesher/main.cpp to /trunk/vegastrike/objconv/mesher/main.cpp
File was copied.
/trunk/vegastrike/Makefile.am Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/configure.ac Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/converter.cpp
File was removed.
/trunk/vegastrike/objconv/mesher/from_BFXM.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/from_BFXM.h Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/from_obj.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/mesh_io.h Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/to_BFXM.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/to_BFXM.h Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/objconv/mesher/to_OgreMesh.cpp Diff Switch to side-by-side view
Loading...
1 2 3 4 > >> (Page 1 of 4)