diff options
| author | Melanie | 2010-01-16 00:05:08 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-16 00:05:08 +0000 |
| commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
| tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /addon-modules/README | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Add "create user" instructions to README.txt (diff) | |
| download | opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz | |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'addon-modules/README')
| -rw-r--r-- | addon-modules/README | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addon-modules/README b/addon-modules/README index 19f268f..b5bf2e0 100644 --- a/addon-modules/README +++ b/addon-modules/README | |||
| @@ -3,3 +3,7 @@ In this directory you can place addon modules for OpenSim | |||
| 3 | Each module should be in it's own tree and the root of the tree | 3 | Each module should be in it's own tree and the root of the tree |
| 4 | should contain a file named "prebuild.xml", which will be included in the | 4 | should contain a file named "prebuild.xml", which will be included in the |
| 5 | main prebuild file. | 5 | main prebuild file. |
| 6 | |||
| 7 | The prebuild.xml should only contain <Project> and associated child tags. | ||
| 8 | The <?xml>, <Prebuild>, <Solution> and <Configuration> tags should not be | ||
| 9 | included since the add-on modules prebuild.xml will be inserted directly into the main prebuild.xml | ||