moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'eclipse_ignore_settings' of https://github.com/TagForce/SickRage into TagForce-eclipse_ignore_settings 

Conflicts:
	.gitignore
This commit is contained in:
Alexandre Beloin 2015-02-15 18:39:14 -05:00
parent eaca966feb 3c60c30878
commit d3375e005b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -40,6 +40,7 @@ Session.vim
*.iml
.idea
*.ipr
.settings/*
# OS generated files #
######################