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

..

AddArtistPanel.java

Improved Agenda module

2015-04-08 10:55:16 +02:00

AddEventPanel.java

Combined Agenda

2015-04-08 16:38:55 +02:00

AddStagePanel.java

Combined Agenda

2015-04-08 16:38:55 +02:00

Agenda.java

Combined Agenda

2015-04-08 16:38:55 +02:00

AgendaStage.java

Merge guus dev

2015-04-08 13:24:41 +02:00

Artist.java

fixed stuff

2015-04-07 17:07:32 +02:00

ArtistPanel.java

fixed stuff

2015-04-07 17:07:32 +02:00

ContentList.java

fixed stuff

2015-04-07 17:07:32 +02:00

ContentTable.java

fixed stuff

2015-04-07 17:07:32 +02:00

EditArtistPanel.java

Improved Agenda module

2015-04-08 10:55:16 +02:00

EditEventPanel.java

Combined Agenda

2015-04-08 16:38:55 +02:00

EditStagePanel.java

Combined Agenda

2015-04-08 16:38:55 +02:00

Event.java

Merge branch 'kenneth' of https://github.com/ProjectgroepA4/FestivalPlanner into kenneth

2015-04-08 20:55:44 +02:00

EventPanel.java

fixed stuff

2015-04-07 17:07:32 +02:00

MenuBar.java

Combined Agenda

2015-04-08 16:38:55 +02:00

Panel.java

fixed stuff

2015-04-07 17:07:32 +02:00

PanelArtSta.java

Combined Agenda

2015-04-08 16:38:55 +02:00

PanelTable.java

fixed stuff

2015-04-07 17:07:32 +02:00

SaveLoad.java

fixed stuff

2015-04-07 17:07:32 +02:00

Stage.java

Combined Agenda

2015-04-08 16:38:55 +02:00

StagePanel.java

fixed stuff

2015-04-07 17:07:32 +02:00

TabbedPane.java

fixed stuff

2015-04-07 17:07:32 +02:00

Timeline.java

fixed stuff

2015-04-07 17:07:32 +02:00

TimelinePanel.java

fixed stuff

2015-04-07 17:07:32 +02:00

Window.java

Combined Agenda

2015-04-08 16:38:55 +02:00