Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

COMP90015-DSAss2-InfinityMonkeys-remaster
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9e5c888c

Commit 9e5c888c authored 5 years ago by Ho Dac Hai

Downloads
- Plain Diff

Merge branch 'hai' into 'master'

Hai

See merge request 1050369/comp90015-dsass2-infinitymonkeys-remaster!43

parents d143d6ad f4f4b9dc

Branches

Tags

No related merge requests found

Changes 13

Show whitespace changes

Inline Side-by-side

Showing

resources/circle.png 0 additions, 0 deletions

resources/circle.png
resources/eraser.png 0 additions, 0 deletions

resources/eraser.png
resources/freehand.png 0 additions, 0 deletions

resources/freehand.png
resources/line.png 0 additions, 0 deletions

resources/line.png
resources/oval.png 0 additions, 0 deletions

resources/oval.png
resources/palette.png 0 additions, 0 deletions

resources/palette.png
resources/rectangle.png 0 additions, 0 deletions

resources/rectangle.png
resources/square.png 0 additions, 0 deletions

resources/square.png
resources/text.png 0 additions, 0 deletions

resources/text.png
src/GUI/PaintGUI.java 9 additions, 18 deletions

src/GUI/PaintGUI.java
src/GUI/StartScreen.java 37 additions, 33 deletions

src/GUI/StartScreen.java
src/client/Client.java 3 additions, 3 deletions

src/client/Client.java
src/server/Server.java 14 additions, 12 deletions

src/server/Server.java

with 63 additions and 66 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