Fixed merge issues.

This commit is contained in:
Cekis
2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
+23 -23
View File
@@ -1,23 +1,23 @@
// string_crc.java
package script;
// ======================================================================
public final class string_crc implements crc
{
public static int getStringCrc(String s)
{
int crc = CRC_INIT;
if (s != null)
{
char[] c = s.toCharArray();
for (int i = 0; i < c.length; ++i)
crc = crctable[((crc>>24) ^ (c[i]&0xff)) & 0xff] ^ (crc << 8);
}
return crc ^ CRC_INIT;
}
}
// ======================================================================
// string_crc.java
package script;
// ======================================================================
public final class string_crc implements crc
{
public static int getStringCrc(String s)
{
int crc = CRC_INIT;
if (s != null)
{
char[] c = s.toCharArray();
for (int i = 0; i < c.length; ++i)
crc = crctable[((crc>>24) ^ (c[i]&0xff)) & 0xff] ^ (crc << 8);
}
return crc ^ CRC_INIT;
}
}
// ======================================================================