RMIT
/
Project_Junker
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100 Commits
1 Branch
277 MiB
Tree: 07dea952c8
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '07dea952c8'
${ noResults }
Project_Junker/unity_Project/Assets/0bjects/Textures/Credits Textures.meta~HEAD....

8 lines
175 B
Raw Normal View History

Merge branch 'master' of https://bitbucket.org/JoshuaReason/project-junker Conflicts: unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_3D_objects.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Jeffrey.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Joshua.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_LOGO.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Lachlan.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_Simon.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_art_assets.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_developed.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_sound.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_text.png.meta unity_Project/Assets/0bjects/Textures/Credits Textures/txtr_credits_trailer.png.meta unity_Project/Assets/GUI Assets/UI_credits.png.meta unity_Project/Assets/GUI Assets/buttons.meta unity_Project/Assets/GUI Assets/buttons/btn_continue.png.meta unity_Project/Assets/GUI Assets/buttons/btn_credits.png.meta unity_Project/Assets/GUI Assets/buttons/btn_exit.png.meta unity_Project/Assets/GUI Assets/buttons/btn_new_game.png.meta unity_Project/Assets/GUI Assets/buttons/btn_settings.png.meta
9 years ago
​
​
​
​
​
​
​
 
  1. fileFormatVersion: 2
  2. guid: 18002ecada6fcf74db33422cdf6b45e3
  3. timeCreated: 1444977403
  4. licenseType: Free
  5. DefaultImporter:
  6.   userData: 
  7.   assetBundleName: 
  8.   assetBundleVariant: