Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
149 Commits 7 Branches 0 Tags
d0baf5673fc78d4e445b583496bfee9b4a9f369f
Commit Graph
15 Commits
Author SHA1 Message Date
kennyboy55 d0baf5673f Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth 
Conflicts:
	Applicatie/Panel.java
	Applicatie/Visitor.java
	Applicatie/WaypointPopup.java
	Listeners/Mouse.java
 2015-04-08 20:55:44 +02:00
Yorick 8167fec369 WOOOOOOOOOOOOOOOOOOOO 2015-04-08 20:31:18 +02:00
Yorick 89036d27af Actions is nul wtf 2015-04-08 17:17:53 +02:00
kennyboy55 9d853babdc Combined Agenda 2015-04-08 16:38:55 +02:00
Yorick a03463442c Merge guus dev 2015-04-08 13:24:41 +02:00
Yorick 701f2aed4b merge kenneth dev 2015-04-08 11:22:01 +02:00
Yorick 82a94ba456 Started with waypoints 2015-04-08 11:18:30 +02:00
kennyboy55 a164f7b781 Improved Agenda module 2015-04-08 10:55:16 +02:00
Yorick f2c1544d71 merge banaan dev 2015-04-07 19:35:38 +02:00
Yorick 32de28204c halverwege 2015-04-07 19:32:10 +02:00
xrgman 98af73b15e fixed stuff 2015-04-07 17:07:32 +02:00
kennyboy55 0c59eb5dd3 Stuff 2015-04-07 16:11:20 +02:00
Yorick d6b511bab5 Merge guus dev 2015-04-07 15:30:17 +02:00
Yorick cba61d4dc5 Merge guus dev 2015-04-07 13:59:34 +02:00
Yorick ea7ecfcd56 Saven werkt van guus 2015-04-07 13:12:02 +02:00