AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-09 23:38:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Florian Nücke 2015-04-01 11:19:18 +02:00
commit 36c7127d57
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -20,4 +20,8 @@
/run /run
# Windows... # Windows...
**/Thumbs.db **/Thumbs.db
# OS X
.DS_Store
/run