Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Team 14 - IDATT1002
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ca79a025

Commit ca79a025 authored 5 years ago by Nicolay Schiøll-Johansen

Downloads
- Patches
- Plain Diff

Revert "Merge branch 'Updating_search' into 'dev'"

This reverts merge request !69

parent aab833ad

No related branches found

No related tags found

Loading

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/NTNU/IDATT1002/controllers/DataExchange.java 0 additions, 9 deletions

src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
src/main/java/NTNU/IDATT1002/controllers/Search.java 40 additions, 78 deletions

src/main/java/NTNU/IDATT1002/controllers/Search.java
src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java 1 addition, 10 deletions

src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
src/main/resources/NTNU/IDATT1002/search.fxml 255 additions, 1 deletion

src/main/resources/NTNU/IDATT1002/search.fxml

with 296 additions and 98 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment