Skip to content

Commit

Permalink
Merge branch 'develop' into ui-localisation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yuubari
Yuubari committed Sep 28, 2017
2 parents 12330e9 + 5cad387 commit 6d1dfec
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ ipch/
*.vsp
*.vspx

# Visual Studio 2017
.vs

# Guidance Automation Toolkit
*.gpState

Expand Down Expand Up @@ -144,4 +147,4 @@ Desktop.ini
$RECYCLE.BIN/

# Mac crap
.DS_Store
.DS_Store

0 comments on commit 6d1dfec

Please sign in to comment.