Merge branch 'master' of o_ggy@git.sourceforge.jp:/gitroot/moflib/moflib

diff --cc saisei-1.0/rpg/rpg/oldcode/BattlerWindow.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/BattlerWindow.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/CharacterBoard.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/CharacterBoard.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/CharacterBoard.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/CommandMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/CommandMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Common.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DataBasedAction.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DataBasedAction.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DataBasedBattler.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DataBasedBattler.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo1.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo1.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo2.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo2.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo3.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Demo3.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DungeonBuilder.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DungeonBuilder.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DungeonBuilderA.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/DungeonBuilderA.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/FightingMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/FightingMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/FixedBattler.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/FixedBattler.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/GameData.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/GameData.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/GameScene.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/GameScene.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/IdealMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/IdealMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/InputSymbolController.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/InputSymbolController.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/ItemData.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/ItemMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/ItemMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/ItemOperationMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MapBuilder.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MapBuilder.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MapImageColor.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Menu.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MenuItemInfo.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MenuItemInfo.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MenuView.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MenuWidget.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MenuWidget.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInstructionSet.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInstructionSet.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInstructionSet.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInstructionSet.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInterpreter.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/MyInterpreter.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/NormalAI.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/NormalAI.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/RandomSymbolController.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/RandomSymbolController.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SpecialAction.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SpecialAction.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/StageScene.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/StageScene.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Symbol.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/Symbol.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SymbolController.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SymbolController.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SymbolManager.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SymbolManager.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SystemFrame.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SystemMenuWidget.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SystemMenuWidget.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/SystemMenuWidget.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/TargetMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/TargetMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/TestScene.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/UsingBattleItemMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/UsingBattleItemMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/World.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/World.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMapBuilder.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMapBuilder.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMapCursor.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMapCursor.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMenu.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldMenu.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldScene.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/WorldScene.h
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/configure.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/main.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/resource.cpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/resource.hpp~
Simple merge

diff --cc saisei-1.0/rpg/rpg/oldcode/tmp.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/resource.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/resource.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/rpg.vcproj
Simple merge

diff --cc saisei-1.0/rpg/rpg/rpg.vcproj.TOMOHIRO.TomohiroYasuda.user
Simple merge

diff --cc saisei-1.0/rpg/rpg/rpg.vcxproj
Simple merge

diff --cc saisei-1.0/rpg/rpg/rpg.vcxproj.filters
Simple merge

diff --cc saisei-1.0/rpg/rpg/rpg.vcxproj.user
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/HighlightButtonView.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/HighlightButtonView.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTileView.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTileView.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTileWidgetView.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTileWidgetView.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTiler.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/ImageTiler.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/createFrame.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/createFrame.hpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/createMenuView.cpp
Simple merge

diff --cc saisei-1.0/rpg/rpg/widget/createMenuView.hpp
Simple merge