Merge branch 'master' into powerpc

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

View File

@ -12,7 +12,7 @@ package java.util;
public class Stack<T> extends Vector<T> {
public boolean empty() {
return size() != 0;
return size() == 0;
}
public T peek() {