HomePhabricator (Chris)

Merge branch 'master' of https://github.com/CM3-GROUP7/DarthInvaders

Description

Merge branch 'master' of https://github.com/CM3-GROUP7/DarthInvaders

  1. Conflicts:
  2. .gitignore
  3. SpaceInvadersTest.vcxproj.filters
  4. Test.cpp
  5. allegro.log

Details

Provenance
Muhammad VaidAuthored on Apr 27 2016, 9:20 AM
Parents
R72:f5ae0e3cac57: Menu without parallex background.
R72:0d24e042999f: useless
Branches
Unknown
Tags
Unknown

Event Timeline