# HG changeset patch
# User Ritor1
# Date 1352981298 -21600
# Node ID f07a29f328e8171bcb0c47cda5476c4987a8e53b
# Parent  fcf3209727a4e943c92a46ea94735cab2ac2a02e# Parent  05b2d9653abc84872c89767a25da8df3b2924d5d
Слияние

diff -r 05b2d9653abc -r f07a29f328e8 Indoor.cpp
diff -r 05b2d9653abc -r f07a29f328e8 LOD.cpp
diff -r 05b2d9653abc -r f07a29f328e8 Outdoor.cpp
diff -r 05b2d9653abc -r f07a29f328e8 PaletteManager.h
diff -r 05b2d9653abc -r f07a29f328e8 mm7_2.cpp