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.

Sign up for GitHub

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

Jump to bottom

Rendoirbranch #3

Merged
merged 30 commits into from
Nov 16, 2016
Merged

Rendoirbranch #3

merged 30 commits into from
Nov 16, 2016

Conversation

j-seixas
Copy link
Owner

No description provided.

rendoir and others added 30 commits November 6, 2016 21:09
@rendoir
Tried to create derived classes for the CourseUnitClass.
795822d 
Compiles. Not sure if working.
@j-seixas
Little updated still to be updated by Timon
92ea0e3
Fixed includes and minor bug fixes
de02238
Merge branch 'RendoirBranch' of https://github.com/myownxdeath/Enroll…
5f46f6d 
…mentSystem.git
Modified some classes that would be problematic in the future.
ae13c34 
Added function declarations for you to do.
Updated.
6e5467a 
Error in find functions - Course.cpp (line92/93)
Bug/error fixes. Compiles.
5d04589
Updated.
5db00cb 
Compiles.
Updated. Compiles.
7372aac
@rendoir
Minour fixes
5f820f1
@rendoir
Big update. Fixes + sorts.
155a13c
@j-seixas
Menu changed
37bf7a3 
So mudei o play (so tirei friend e o parametro m)
@j-seixas
MENUS YEAH
22e9916
@rendoir
Updated. Compiles.
19d96f4
@rendoir
Updated. Compiles.
67406b8
@j-seixas
Yeah updated
20fbf63
@j-seixas
Its running boy!
3144f89
@j-seixas
Corrected mainMenu
e690751
@j-seixas
Revert "Its running boy!"
0b32448 
This reverts commit 3144f89.
@j-seixas
Revert "Revert "Its running boy!""
72216d2 
This reverts commit 0b32448.
@j-seixas
Merge remote-tracking branch 'refs/remotes/origin/RendoirBranch' into…
70cd041 
… Menuslindosxoxo

# Conflicts:
#	main.cpp
@j-seixas
...
61cc482
Merge Menuslindosxoxo
e67eafa 
Menuslindosxoxo
Sorting options ready
da6dd5d
@j-seixas
Add Remove University
6fa7139
Updated
7ecc4d2
Merge branch 'RendoirBranch' of https://github.com/myownxdeath/Enroll…
4fb872b 
…mentSystem.git
@j-seixas
loads
d883ff3
@j-seixas
+1 load
6aa754f
@j-seixas
Corrected some lines in loads
d0ddccd
@j-seixas j-seixas merged commit 22b52a8 into master Nov 16, 2016
@j-seixas j-seixas deleted the RendoirBranch branch November 16, 2016 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@j-seixas @rendoir