Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_main_menu.xml
This commit is contained in:
Christopher Beckmann 2015-11-17 15:43:32 +01:00
commit 0370fdad4e

View file

@ -17,7 +17,7 @@ public class SudokuButton extends Button {
private SudokuButtonType type = SudokuButtonType.Unspecified; private SudokuButtonType type = SudokuButtonType.Unspecified;
public SudokuButton(Context context, AttributeSet attrs) { public SudokuButton(Context context, AttributeSet attrs) {
super(context, attrs,R.attr.borderlessButtonStyle); super(context, attrs);
} }
public void setValue(int value) { this.value = value; } public void setValue(int value) { this.value = value; }