Shattered Pixel Dungeon: fix merge error
This commit is contained in:
parent
2bc38b186a
commit
f8becfe92c
|
@ -64,13 +64,6 @@ Build:0.2.3f,32
|
||||||
echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
|
echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
|
||||||
target=android-19
|
target=android-19
|
||||||
|
|
||||||
Build:0.2.4b,35
|
|
||||||
commit=22d072f3e7e0e36b9a3bd2a6794cef74c6d83572
|
|
||||||
srclibs=PDClasses-shattered@35fad7951ad9cd223921a79512098013697b9d76
|
|
||||||
prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
|
|
||||||
echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
|
|
||||||
target=android-19
|
|
||||||
|
|
||||||
Build:0.2.4b,35
|
Build:0.2.4b,35
|
||||||
commit=22d072f3e7e
|
commit=22d072f3e7e
|
||||||
srclibs=PDClasses-shattered@35fad7951a
|
srclibs=PDClasses-shattered@35fad7951a
|
||||||
|
|
Loading…
Reference in a new issue