# HG changeset patch
# User Ritor1
# Date 1352817621 -21600
# Node ID 6d1f537a134603f3c9e67fbd7c3d3f61f6d38370
# Parent  b07ebaa9a30d505c9a67f63b4f454e68ee04945f# Parent  a2715ce5cf172f41e18f7db1e2c3e5e9e0edcb0d
Слияние

diff -r a2715ce5cf17 -r 6d1f537a1346 Indoor.cpp
diff -r a2715ce5cf17 -r 6d1f537a1346 LOD.cpp
diff -r a2715ce5cf17 -r 6d1f537a1346 Outdoor.cpp
diff -r a2715ce5cf17 -r 6d1f537a1346 PaletteManager.h
diff -r a2715ce5cf17 -r 6d1f537a1346 mm7_2.cpp