1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-03 22:52:24 -05:00

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
commit d3375e005b

1
.gitignore vendored
View File

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