# HG changeset patch
# User Ritor1
# Date 1352817427 -21600
# Node ID b07ebaa9a30d505c9a67f63b4f454e68ee04945f
# Parent  8981a63bb5595f408f9485a7833752aa3d9d7a23# Parent  918dca16223954f2caf2513b7d251db8223e7a0e
Слияние

diff -r 918dca162239 -r b07ebaa9a30d Indoor.cpp
diff -r 918dca162239 -r b07ebaa9a30d LOD.cpp
diff -r 918dca162239 -r b07ebaa9a30d Outdoor.cpp
diff -r 918dca162239 -r b07ebaa9a30d PaletteManager.h
diff -r 918dca162239 -r b07ebaa9a30d mm7_2.cpp