Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-04-24 10:17:18 +02:00
commit 8f95b855a1
2 changed files with 0 additions and 8 deletions

View file

@ -189,12 +189,6 @@ task collectVoiceAssets(type: Sync) {
include "**/*.p" include "**/*.p"
} }
task collectSpecialPhrasesAssets(type: Sync) {
from "../../resources/specialphrases"
into "assets/specialphrases"
include "*.txt"
}
task collectHelpContentsAssets(type: Sync) { task collectHelpContentsAssets(type: Sync) {
from "../../help" from "../../help"
into "assets/help" into "assets/help"
@ -242,7 +236,6 @@ task copyStyleIcons(type: Copy) {
task collectExternalResources << {} task collectExternalResources << {}
collectExternalResources.dependsOn collectVoiceAssets, collectExternalResources.dependsOn collectVoiceAssets,
collectSpecialPhrasesAssets,
collectHelpContentsAssets, collectHelpContentsAssets,
collectRoutingResources, collectRoutingResources,
collectRenderingStylesResources, collectRenderingStylesResources,

View file

@ -78,7 +78,6 @@
<target name="copy_resources"> <target name="copy_resources">
<copy todir="assets"> <copy todir="assets">
<fileset dir="../../resources/"> <fileset dir="../../resources/">
<include name="specialphrases/**" />
<include name="voice/**/*.p" /> <include name="voice/**/*.p" />
</fileset> </fileset>
</copy> </copy>