minenice55 6297980922 fix all merge conflicts ... unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this		2022-08-09 11:23:17 -04:00
..
Animations	Tram&Pauline (#111)	2022-06-23 12:45:19 -07:00
Effects	Fix Tram and Pauline file locations (#113)	2022-06-23 17:05:19 -07:00
Trampolines	Fix Tram and Pauline file locations (#113)	2022-06-23 17:05:19 -07:00
Animations.meta	Tram&Pauline	2022-04-11 02:05:43 -07:00
Effects.meta	fix all merge conflicts	2022-08-09 11:23:17 -04:00
RECOVER_RECOVER_Tram-&-Pauline-Sprite-Sheet.png.meta	Fix Tram and Pauline file locations (#113)	2022-06-23 17:05:19 -07:00
Tram&Pauline_BackCurtains.png.meta	Tram&Pauline	2022-07-25 01:04:16 -07:00
Tram&Pauline_Colors.png.meta	Fix Tram and Pauline file locations (#113)	2022-06-23 17:05:19 -07:00
Tram&Pauline_Curtains.png.meta	Tram&Pauline	2022-07-25 01:04:16 -07:00
Tram&Pauline_People.png.meta	Tram&Pauline (#111)	2022-06-23 12:45:19 -07:00
Tram&Pauline_SpriteSheet.png.meta	Tram&Pauline	2022-07-25 01:04:16 -07:00
Tram&Pauline_Stage.png.meta	Tram&Pauline (#111)	2022-06-23 12:45:19 -07:00
Tram-&-Pauline-Curtains.png.meta	fix all merge conflicts	2022-08-09 11:23:17 -04:00
Tram-&-Pauline-Sprite-Sheet 1.png.meta	fix all merge conflicts	2022-08-09 11:23:17 -04:00
Trampolines.meta	fix all merge conflicts	2022-08-09 11:23:17 -04:00