marcus13345
|
efe8f6eb52
|
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
|
2014-10-20 23:05:04 -04:00 |
|
marcus13345
|
62a25399ac
|
gitignore ugh
|
2014-10-20 23:04:19 -04:00 |
|
Marcus Gosselin
|
633c88e4ea
|
wut
|
2014-10-16 18:40:33 -04:00 |
|
Marcus Gosselin
|
2c94c4b835
|
more modular main
|
2014-10-11 14:53:37 -04:00 |
|
Marcus Gosselin
|
ffd55385c5
|
changed git ignore
ignores pngs and variable files
|
2014-10-11 14:52:52 -04:00 |
|
Marcus Gosselin
|
95e7ca7be2
|
new gitignore
|
2014-10-09 14:18:14 -04:00 |
|
marcus13345
|
8171d7445f
|
first
|
2014-09-29 16:51:46 -04:00 |
|
marcus13345
|
16b1144771
|
:neckbeard: Added .gitattributes & .gitignore files
|
2014-09-29 16:51:20 -04:00 |