Skip to content

Commit cb99f37

Browse files
committed
Fixed merge conflicts
2 parents 3f56fef + c1f3694 commit cb99f37

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

.gitignore

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,7 @@
22
*~
33
screen.png
44
/bin/
5-
/bin/
6-
/bin/
7-
/bin/
8-
/bin/
9-
/bin/
10-
/bin/
11-
/bin/
12-
/bin/
13-
/bin/
14-
/bin/
15-
/bin/
16-
/bin/
17-
/bin/
18-
/bin/
19-
/bin/
20-
/bin/
21-
/bin/
22-
/bin/
23-
/bin/
24-
/bin/
25-
/bin/
26-
/bin/
27-
/bin/
28-
/bin/
29-
/bin/
30-
/bin/
31-
/bin/
32-
/bin/
5+
.idea
6+
*.iml
7+
*.class
8+

build.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<project>
2+
3+
<target name="clean">
4+
<delete dir="build"/>
5+
</target>
6+
7+
<target name="compile">
8+
<mkdir dir="build/classes"/>
9+
<javac srcdir="src" destdir="build/classes"/>
10+
</target>
11+
12+
<target name="jar">
13+
<jar destfile="AdbRemoteScreen.jar" basedir="build/classes">
14+
<manifest>
15+
<attribute name="Main-Class" value="com.majeur.ars.AdbRemoteScreen"/>
16+
</manifest>
17+
</jar>
18+
</target>
19+
20+
<target name="run">
21+
<java jar="AdbRemoteScreen.jar" fork="true"/>
22+
</target>
23+
24+
</project>

0 commit comments

Comments
 (0)