Merge branch 'Twidere' into 'master'

Twidere: Update ColorPicker version as per upstream

See merge request !829
This commit is contained in:
Boris Kraut 2015-06-18 16:53:03 +00:00
commit f22c243c16

View file

@ -330,7 +330,7 @@ Build:0.3.0-dev-114,114
subdir=twidere
submodules=yes
gradle=fdroid
srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MariotakuDragSort@0.6.1,MariotakuMessageBubbleView@1.2,MariotakuSlidingMenu@501a9988a4d95958fe634fc09d5dc332de7830b9,ColorPicker-uucky@0.9.4,AsyncManager@9391ed71d7f3665217ab782acf4e6902d2425547
srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MariotakuDragSort@0.6.1,MariotakuMessageBubbleView@1.2,MariotakuSlidingMenu@501a9988a4d95958fe634fc09d5dc332de7830b9,ColorPicker-uucky@0.9.7,AsyncManager@9391ed71d7f3665217ab782acf4e6902d2425547
rm=twidere.wear,twidere.extension.push.xiaomi,twidere.donate.nyanwp.wear,libraries/SlidingMenu/example
prebuild=sed -i -e '/googleCompile/d' -e '/amazonaws/d' -e '/jitpack/d' build.gradle && \
cp -fR $$CWACMerge$$/merge/src/com src/main/java/ && \