Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a Rifle class under cristobal_caballero directory #3

Merged
merged 2 commits into from
Nov 5, 2016

Conversation

CrisCab
Copy link

@CrisCab CrisCab commented Oct 28, 2016

A class for rifles; also added an extended class for a rifle with a scope

@jmangel
Copy link
Owner

jmangel commented Nov 5, 2016

Merging this so the TA's can finish lab04 grading, removing .idea files manually. PLEASE MAKE SURE you do not include .idea files in future commits @CrisCab

@jmangel jmangel closed this Nov 5, 2016
@jmangel jmangel reopened this Nov 5, 2016
@jmangel jmangel merged commit 60eb560 into jmangel:master Nov 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants