Scott Main da0a56df96 resolved conflicts for merge of e0408aa1 to eclair

2009-09-10 18:08:37 -07:00

..

java

resolved conflicts for merge of e0408aa1 to eclair

2009-09-10 18:08:37 -07:00

jni

Remove "predefined" elements from Java layer. Static elements continue to exist but are no longer treated as a special version of element.

2009-09-04 14:42:41 -07:00