Joe Onorato c66f16ec41 Merge "Connect my plumbing to dsandler's awesome lights out mode."

2010-09-12 14:07:04 -07:00

..

config

…

java

Merge "Connect my plumbing to dsandler's awesome lights out mode."

2010-09-12 14:07:04 -07:00

jni

Merge "Return count of rows in a resultset only once (when startPos = 0)"

2010-09-10 13:45:45 -07:00

res

Merge "Correct implementation of saveLayer()."

2010-09-12 12:25:13 -07:00

tests

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00