Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-17 01:28:16 +02:00
commit 0e285f92f2

View file

@ -30,14 +30,14 @@ public class ColorDialogs {
};
public static int[] pallette = new int[] {
0xffd00d0d,
0xffe044bb,
0xffff5020,
0xff8e2512,
0xffeeee10,
0xff10c0f0,
0xff1010a0,
0xff88e030
0xb4d00d0d,
0xb4e044bb,
0xb4ff5020,
0xb48e2512,
0xb4eeee10,
0xb410c0f0,
0xb41010a0,
0xb488e030
};