Skip to content
This repository was archived by the owner on Mar 10, 2019. It is now read-only.

Commit 4905bf6

Browse files
committed
Merge branch 'master' into develop
2 parents 563fc30 + cfdc151 commit 4905bf6

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2018 @devgianlu
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ ifconfig
8080

8181
from your terminal. Find the one section that has ```<UP,BROADCAST,RUNNING,MULTICAST>``` and copy the IP address, which should be marked as *inet*. Paste that IP address in your browser. If all is working smoothly, you should be taken to a page asking for you to enter a username.
8282

83-
[screen1]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen1.png?raw=true
84-
[screen2]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen2.png?raw=true
85-
[screen3]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen3.png?raw=true
86-
[screen4]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen4.png?raw=true
87-
[screen5]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen5.png?raw=true
88-
[screen6]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen6.png?raw=true
89-
[screen7]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen7.png?raw=true
90-
[screen8]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen8.png?raw=true
91-
[screen9]: https://github.com/devgianlu/PYX-Reloaded/blob/material-ui/screenshots/screen9.png?raw=true
83+
[screen1]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen1.png?raw=true
84+
[screen2]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen2.png?raw=true
85+
[screen3]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen3.png?raw=true
86+
[screen4]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen4.png?raw=true
87+
[screen5]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen5.png?raw=true
88+
[screen6]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen6.png?raw=true
89+
[screen7]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen7.png?raw=true
90+
[screen8]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen8.png?raw=true
91+
[screen9]: https://github.com/devgianlu/PYX-Reloaded/blob/master/screenshots/screen9.png?raw=true

src/assembly/zip.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
33
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
4-
<id>${project.version}</id>
4+
<id>deploy</id>
5+
<baseDirectory>/PYX-Reloaded-${project.version}</baseDirectory>
56
<formats>
67
<format>tar.gz</format>
78
<format>tar.bz2</format>

0 commit comments

Comments
 (0)