conflicts
Showing
- cmi2/assets/addFriendsMulti/backgdadd.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/backgdadd.png
- cmi2/assets/addFriendsMulti/backgdadd.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/backgdadd.png.import
- cmi2/assets/addFriendsMulti/buttonbckgd.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/buttonbckgd.png
- cmi2/assets/addFriendsMulti/buttonbckgd.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/buttonbckgd.png.import
- cmi2/assets/addFriendsMulti/grabber.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/grabber.png
- cmi2/assets/addFriendsMulti/grabber.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/grabber.png.import
- cmi2/assets/addFriendsMulti/grabber2.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/grabber2.png
- cmi2/assets/addFriendsMulti/grabber2.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/grabber2.png.import
- cmi2/assets/addFriendsMulti/grabbergrab.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/grabbergrab.png
- cmi2/assets/addFriendsMulti/grabbergrab.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/grabbergrab.png.import
- cmi2/assets/addFriendsMulti/scrollbar.png 0 additions, 0 deletionscmi2/assets/addFriendsMulti/scrollbar.png
- cmi2/assets/addFriendsMulti/scrollbar.png.import 34 additions, 0 deletionscmi2/assets/addFriendsMulti/scrollbar.png.import
- cmi2/assets/addFriendsMulti/scrollbar.psd 0 additions, 0 deletionscmi2/assets/addFriendsMulti/scrollbar.psd
- cmi2/assets/allPage/bin.png 0 additions, 0 deletionscmi2/assets/allPage/bin.png
- cmi2/assets/allPage/bin.png.import 34 additions, 0 deletionscmi2/assets/allPage/bin.png.import
- cmi2/assets/allPage/profile.png 0 additions, 0 deletionscmi2/assets/allPage/profile.png
- cmi2/assets/allPage/profile.png.import 34 additions, 0 deletionscmi2/assets/allPage/profile.png.import
- cmi2/assets/login/backgdlogin.png 0 additions, 0 deletionscmi2/assets/login/backgdlogin.png
- cmi2/assets/login/backgdlogin.png.import 34 additions, 0 deletionscmi2/assets/login/backgdlogin.png.import
- cmi2/scenes/Login.tscn 105 additions, 72 deletionscmi2/scenes/Login.tscn
Please register or sign in to comment