 Amrit Panesar
|
430eb3c314
|
Merge branch 'master' of git@github.com:Neo-Desktop/Coleman-Code.git
Conflicts:
COM380/Project5/GambleKit/CustomGameLogic/Pages/MainPage.cpp
|
2015-05-20 18:16:29 -07:00 |
|
|
Amrit Panesar
|
b34d39a97f
|
project 5 finalized
Signed-off-by: Amrit Panesar <apanesar@4195tech.com>
|
2015-05-20 18:14:51 -07:00 |
|
|
Amrit Panesar
|
1fa1ffad2a
|
project 3 com380
Signed-off-by: Amrit Panesar <apanesar-77260@student.coleman.edu>
|
2015-05-20 17:48:28 -07:00 |
|
|
Amrit Panesar
|
88442e20b4
|
Offically dubbed the money machine becuase I'm uncreative
Signed-off-by: Amrit Panesar <apanesar-77260@student.coleman.edu>
|
2015-05-19 03:25:15 -07:00 |
|
|
Amrit Panesar
|
70c357cef3
|
project5 com380
Signed-off-by: Amrit Panesar <apanesar@4195tech.com>
|
2015-05-17 23:54:42 -07:00 |
|
|
Amrit Panesar
|
9a516320aa
|
com380 project 4 fixes
Signed-off-by: Amrit Panesar <apanesar@4195tech.com>
|
2015-05-16 15:59:49 -07:00 |
|
|
Amrit Panesar
|
39ee821f54
|
start 380 project5
changes to 380 project 4
changes to 350 project 2
Signed-off-by: Amrit Panesar <apanesar@4195tech.com>
|
2015-05-06 10:18:39 -07:00 |
|