# HG changeset patch
# User Ritor1
# Date 1352304604 -21600
# Node ID d2ca891da89feaf4ab943d0298db163a79e2e313
# Parent  7b12505a23c03d504c1ddf261aa119baf39289e2# Parent  8feb2dfd2f89dd75a58ca12973a17317a979e0e0
Слияние

diff -r 8feb2dfd2f89 -r d2ca891da89f Indoor.cpp
diff -r 8feb2dfd2f89 -r d2ca891da89f LOD.cpp
diff -r 8feb2dfd2f89 -r d2ca891da89f Outdoor.cpp
diff -r 8feb2dfd2f89 -r d2ca891da89f PaletteManager.h
diff -r 8feb2dfd2f89 -r d2ca891da89f mm7_2.cpp