Merge branch 'master' into feature/branches (210fdfd9) · Commits · Shane Veasy / Unity · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

U

Unity
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

210fdfd9

Commit 210fdfd9 authored 8 years ago by Emil "AngryAnt" Johansen

Downloads
- Plain Diff

Merge branch 'master' into feature/branches

# Conflicts:
#	src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Settings.cs

parents 1b6f0a33 b9eaef54

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Settings.cs 135 additions, 38 deletions

src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Settings.cs
src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Tasks/GitStatusTask.cs 1 addition, 1 deletion

...Unity/Assets/Plugins/GitHub/Editor/Tasks/GitStatusTask.cs
src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Tasks/Tasks.cs 5 additions, 3 deletions

src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Tasks/Tasks.cs
src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Utility.cs 1 addition, 2 deletions

src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Utility.cs
src/GitHub.Unity/Assets/Plugins/GitHub/Editor/Views/HistoryView.cs 38 additions, 1 deletion

...b.Unity/Assets/Plugins/GitHub/Editor/Views/HistoryView.cs

with 180 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

VideoLAN code repository instance