Romain Guy 5519185292 resolved conflicts for merge of bad927 to master

2009-06-08 15:33:17 -07:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

2009-05-01 17:47:08 -07:00

java

resolved conflicts for merge of bad927 to master

2009-06-08 15:33:17 -07:00

jni

rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.

2009-06-05 01:26:23 -07:00

res

resolved conflicts for merge of bad927 to master

2009-06-08 15:33:17 -07:00