Merge branch 'master' into hayabusa-5.0

lmucs · Nov 17, 2015 · 807bc6b · 807bc6b
2 parents 49324b2 + cadff8d
commit 807bc6b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 0 deletions.
diff --git a/Test2D/Content/2DSideScrollerBP/Blueprints/JumpText.uasset b/Test2D/Content/2DSideScrollerBP/Blueprints/JumpText.uasset
diff --git a/Test2D/Content/2DSideScrollerBP/Blueprints/KickPunchText.uasset b/Test2D/Content/2DSideScrollerBP/Blueprints/KickPunchText.uasset
diff --git a/Test2D/Content/2DSideScrollerBP/Blueprints/MainMenu.uasset b/Test2D/Content/2DSideScrollerBP/Blueprints/MainMenu.uasset
diff --git a/Test2D/Content/2DSideScrollerBP/Blueprints/MoveText.uasset b/Test2D/Content/2DSideScrollerBP/Blueprints/MoveText.uasset
diff --git a/Test2D/Content/2DSideScrollerBP/Blueprints/NinjaStarText.uasset b/Test2D/Content/2DSideScrollerBP/Blueprints/NinjaStarText.uasset
diff --git a/Test2D/Content/2DSideScrollerBP/Maps/2DSideScrollerExampleMap.umap b/Test2D/Content/2DSideScrollerBP/Maps/2DSideScrollerExampleMap.umap