Author
Committer
Branch
Timestamp
Parent
Ported
Zacam
antipodes
2012-01-13 12:49
Pending
Changeset
Synchronization of differences between Antipodes and Trunk. Cause unknown, just commit drift issues. Regular auditing will catch these faster, but people need to pay more attention when syncing Trunk changes over to Antipodes.
mod - /trunk/fs2_open/code/stats/medals.h
Diff
File
mod - /trunk/fs2_open/code/stats/medals.cpp
Diff
File
mod - /trunk/fs2_open/code/object/objectsort.cpp
Diff
File
mod - /trunk/fs2_open/code/nebula/neblightning.cpp
Diff
File
mod - /trunk/fs2_open/code/iff_defs/iff_defs.cpp
Diff
File
mod - /trunk/fs2_open/code/bmpman/bmpman.cpp
Diff
File
mod - /branches/antipodes/code/stats/medals.cpp
Diff
File
mod - /branches/antipodes/code/ship/ship.h
Diff
File
mod - /branches/antipodes/code/playerman/managepilot.h
Diff
File
mod - /branches/antipodes/code/parse/sexp.cpp
Diff
File
mod - /branches/antipodes/code/palman/palman.cpp
Diff
File
mod - /branches/antipodes/code/iff_defs/iff_defs.h
Diff
File
mod - /branches/antipodes/code/iff_defs/iff_defs.cpp
Diff
File
mod - /branches/antipodes/code/graphics/gropenglbmpman.cpp
Diff
File
mod - /branches/antipodes/code/globalincs/globals.h
Diff
File
mod - /branches/antipodes/code/bmpman/bmpman.h
Diff
File
mod - /branches/antipodes/code/bmpman/bmpman.cpp
Diff
File