aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.nant
diff options
context:
space:
mode:
authorMelanie2013-01-06 10:52:16 +0000
committerMelanie2013-01-06 10:52:16 +0000
commit40955fee2a2e15566734139411b9ebb13570513c (patch)
treed702441c8d7f49274cbfdd7f6d7252c6786eaed2 /.nant
parentMerge branch 'master' into careminster (diff)
parentBulletSim: fix problem where mesh shapes were physically just their bounding ... (diff)
downloadopensim-SC-40955fee2a2e15566734139411b9ebb13570513c.zip
opensim-SC-40955fee2a2e15566734139411b9ebb13570513c.tar.gz
opensim-SC-40955fee2a2e15566734139411b9ebb13570513c.tar.bz2
opensim-SC-40955fee2a2e15566734139411b9ebb13570513c.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--.nant/local.include2
1 files changed, 1 insertions, 1 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 2339ce8..c207944 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -47,7 +47,7 @@
47 <delete> 47 <delete>
48 <fileset basedir="${distbindir}"> 48 <fileset basedir="${distbindir}">
49 <include name="compile.bat"/> 49 <include name="compile.bat"/>
50 <include name="BUILDING.txt"/> 50 <include name="BUILDING.md"/>
51 <include name="Makefile"/> 51 <include name="Makefile"/>
52 <include name="nant-color"/> 52 <include name="nant-color"/>
53 <include name="OpenSim.*"/> 53 <include name="OpenSim.*"/>