Merge branch 'master' of

http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
	display-client/.classpath
	display-client/project.properties

display-client/AndroidManifest.xml

@@ -97,6 +97,10 @@
            android:name="com.wade.mobile.common.audio.activity.AudioPlayerActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <!-- 标记地图 -->
        <activity android:name="com.wade.mobile.common.map.activity.MarkMapActivity">
        </activity>

display-client/lint.xml

@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<?xml version="1.0" encoding="UTF-8"?>
<lint>
</lint>

display-client/project.properties

@@ -1,3 +1,4 @@
<<<<<<< HEAD
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
@@ -14,4 +15,4 @@
target=android-15
android.library=false
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib
android.library.reference.2=../wade-mobile-lib

display-client/src/com/ai/mobile/display/测试.txt

@@ -1,4 +1,6 @@
测试，测试……001fasdfadsfaxiaowang
程文斌提交dfadfa
能都成功？
测试成功01--阳彪
测试成功01--阳彪
测试A
123

display-client/src/com/ai/mobile/display/测试2.txt

@@ -0,0 +1 @@
测试成功2

ipu-server/.gitignore

@@ -4,4 +4,5 @@
/web/res.version.properties
/.DS_Store
/web/.DS_Store
/web/WEB-INF/.DS_Store
/web/WEB-INF/.DS_Store
/bin/