search

ui-cs383 / Freedom-Galaxy

Primary repository for the FitG
1 stars 6 forks source link

Massive Merge #48

Closed cawaltrip closed 10 years ago

cawaltrip commented 10 years ago

This has all of the client code and all of the updates from hall5714/master as of:

12 December 2013 02:18 AM

BE VERY CAREFUL WITH THIS PULL REQUEST, IT IS HUGE!!!!

hallister commented 10 years ago

Well I pulled this but it assigned the entire client teams git history to @cawaltrip (not sure why chris-master didn't have the client team repo history)?

cawaltrip commented 10 years ago

I was tired last night and just wanted to get it all in one repo. I didn't try to merge the two projects together.

hallister commented 10 years ago

Oh ok. I may try it this week to get all of the commits attributed properly. May or may not be successful.