From f4b1265393b8ea519f1b73d8723c5aae3dd73fa0 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Wed, 2 May 2012 20:33:09 +0300
Subject: [PATCH] Revert to previous style of work

Conflicts:

	OsmAnd/assets/bundled_assets.xml
	Osmand-kernel/expat/expat_library
	Osmand-kernel/freetype/freetype_library
	Osmand-kernel/gif/gif_library
	Osmand-kernel/jpeg/jpeg_library
	Osmand-kernel/png/png_library
	Osmand-kernel/skia/skia_library
---
 OsmAnd/assets/bundled_assets.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 OsmAnd/assets/bundled_assets.xml

diff --git a/OsmAnd/assets/bundled_assets.xml b/OsmAnd/assets/bundled_assets.xml
new file mode 100755
index 0000000000..3bbc7e5efc
--- /dev/null
+++ b/OsmAnd/assets/bundled_assets.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assets>
+	<!-- Supported modes: -->
+	<!-- 	overwriteOnlyIfExists - Overwrites file only if file with same name exists on target system -->
+	<!-- 	alwaysCopyOnFirstInstall - Copies file on first install, always -->
+	<!-- 	alwaysOverwriteOrCopy - Copies or overwrites file unconditionally -->
+	<!-- 	copyOnlyIfDoesNotExist - Copies file only this file is not present on target system -->
+	<asset source="voice/cs-tts/ttsconfig.p" destination="voice/cs-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/de-tts/ttsconfig.p" destination="voice/de-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/en-miles-tts/ttsconfig.p" destination="voice/en-miles-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/en-tts/ttsconfig.p" destination="voice/en-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/es-tts/ttsconfig.p" destination="voice/es-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/fi-tts/ttsconfig.p" destination="voice/fi-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/fr-tts/ttsconfig.p" destination="voice/fr-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/hu-tts/ttsconfig.p" destination="voice/hu-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/it-tts/ttsconfig.p" destination="voice/it-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/nl-tts/ttsconfig.p" destination="voice/nl-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/pl-tts/ttsconfig.p" destination="voice/pl-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/ru-tts/ttsconfig.p" destination="voice/ru-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/sk-tts/ttsconfig.p" destination="voice/sk-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/sv-tts/ttsconfig.p" destination="voice/sv-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+	<asset source="voice/zh-tts/ttsconfig.p" destination="voice/zh-tts/ttsconfig.p" mode="overwriteOnlyIfExists" /> 
+</assets>
\ No newline at end of file