Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Totschnig 2013-12-01 22:47:24 +01:00
commit 41792908aa
2 changed files with 11 additions and 0 deletions

View file

@ -32,6 +32,11 @@ Build:1.8.0,25
extlibs=android/android-support-v4.jar extlibs=android/android-support-v4.jar
prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/ prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
Build:1.8.1,26
commit=1.8.1
extlibs=android/android-support-v4.jar
prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:1.8.1 Current Version:1.8.1

View file

@ -70,6 +70,12 @@ Build:1.8.2,46
prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \ prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
Build:1.8.3,48
commit=v1.8.3
srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae
prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:1.8.3 Current Version:1.8.3