Merge branch 'master' of

ssh://git@stash.nordicsemi.no:7999/apps-android/dfu-library.git

Conflicts:
	src/no/nordicsemi/android/dfu/HexInputStream.java
This commit is contained in:
Aleksander Nowakowski 2014-11-03 09:50:26 +01:00
commit 08770b583f
1 changed files with 1 additions and 1 deletions

View File

@ -25,7 +25,7 @@ import no.nordicsemi.android.dfu.exception.HexFileValidationException;
* </p>
*/
public class HexInputStream extends FilterInputStream {
private final int LINE_LENGTH = 128;
private final int LINE_LENGTH = 20;
private final byte[] localBuf;
private int localPos;
private int pos;