diff options
| author | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
| commit | 56a1de48ee43bfacbd3ef2859f392082a26bc814 (patch) | |
| tree | 03bd6092dab42985e536b84d2f311a3a12e4edb4 /.gitignore | |
| parent | Added a licensing note about gpg.vs, as used to build OTR on Windows. (diff) | |
| parent | Merge remote-tracking branch 'origin/next' into WL-refactor (diff) | |
| download | meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.zip meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.gz meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.bz2 meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.xz | |
Merge remote-tracking branch 'imprudence/next' into next
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 15 |
1 files changed, 12 insertions, 3 deletions
| @@ -1,12 +1,21 @@ | |||
| 1 | # | 1 | # |
| 2 | # This file contains names (and wildcards) of files that | 2 | # This file contains names (and wildcards) of files that |
| 3 | # Git should ignore. | 3 | # Git should ignore. |
| 4 | # | 4 | # |
| 5 | 5 | # Since we only care about the actual source code files, | |
| 6 | # all the libraries are ignored, as are the files that | ||
| 7 | # are created when you compile. | ||
| 8 | # | ||
| 6 | 9 | ||
| 7 | # LIBRARIES | 10 | # LIBRARIES |
| 8 | 11 | ||
| 9 | linden/LICENSES/ | 12 | # These two lines are a bit tricky. |
| 13 | # The ! syntax negates a pattern, | ||
| 14 | # but it needs a pattern, not just a directory. | ||
| 15 | # So turn the first line into a pattern for ! to negate. | ||
| 16 | linden/LICENSES/* | ||
| 17 | !linden/LICENSES/LICENSE-logos.txt | ||
| 18 | |||
| 10 | linden/LICENSE-libraries-*.txt | 19 | linden/LICENSE-libraries-*.txt |
| 11 | linden/libraries/ | 20 | linden/libraries/ |
| 12 | linden/indra/newview/app_settings/mozilla*/ | 21 | linden/indra/newview/app_settings/mozilla*/ |