ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 12:48:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into powerpc

Browse Source 
Conflicts:

	makefile
	src/assembler.h
	src/compile.cpp
	src/compiler.cpp
	src/compiler.h
	src/finder.cpp
This commit is contained in:
Joel Dice
2008-11-11 08:20:49 -07:00
parent 2304a656cf
commit c80eb51c17
47 changed files with 1508 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/java/util/Locale.java
View File

@ -11,7 +11,7 @@
package java.util;
public class Locale {
public static final Locale ENGLISH = new Locale("en");
public static final Locale ENGLISH = new Locale("en", "us");
private final String language;
private final String country;