Merge branch 'master' of ssh://repo.or.cz/srv/git/freespace
treed7dca2cb7810aed7475e42871f890589f3bdcf2f
-rw-r--r-- 736 .classpath
-rw-r--r-- 811 .project
-rw-r--r-- 5072 AndroidManifest.xml
-rw-r--r-- 1483 License
drwxr-xr-x - bak
-rw-r--r-- 1306 build.xml
-rw-r--r-- 378 default.properties
drwxr-xr-x - examples
drwxr-xr-x - image
drwxr-xr-x - json
drwxr-xr-x - lib
-rw-r--r-- 1034 proguard.cfg
-rw-r--r-- 493 project.properties
-rw-r--r-- 3661 readme.txt
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - weibo
drwxr-xr-x - weibosrc