aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-011-22/+10
| | | | | | | | | | | | | | | | discussed on IRC and the mailing list, and remove some SL logos. I know, there are two slightly different LICENSE-logos.txt files. One that was originally in the source repo, one that was from the artwork package. I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * Added SSE2 packaging and configuration the copied pdb filename, moved it up ↵McCabe Maxsted2011-09-081-2/+2
| | | | | | | | one directory to the main viewer folder
| * Added basic copying of symbol files when the windows package project is run. ↵McCabe Maxsted2011-09-081-0/+1
| | | | | | | | Todo: add SSE2 target
* | Merge remote-tracking branch 'imprudence/1.4-beta1.5' into nextDavid Walter Seikel2011-07-211-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts (merged manually): .gitignore linden/indra/newview/llgesturemgr.cpp linden/indra/newview/viewerinfo.cpp
| * Fixed windows installer files missing from the repo and added the VS2010 ↵McCabe Maxsted2011-06-241-1/+0
| | | | | | | | redist (needed for the new openal libs and upcoming VS2010 support)
| * Added Windows Imprudence install scripts to the repo and modified the ↵McCabe Maxsted2011-03-201-1/+0
| | | | | | | | artwork package
* | checkpoint, non functionalJay Threeth2011-04-021-1/+1
| |
* | Removed some spaces.David Seikel2011-03-211-2/+2
| |
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Added the newview/character directory to the repo. This'll make it easier to ↵McCabe Maxsted2011-03-141-1/+0
| | | | | | | | update
* | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-1/+1
| | | | | | | | | | | | need to be reverted later. Changed file names to.
* | Artwork and font files in the repo now.David Seikel2011-02-081-25/+0
|/ | | | | My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that they will still have the files a month from now. Been burnt with that before.
* RED-626: Added linden/indra/newview/mozilla-universal-darwin.tgz to .gitignoreelektrahesse2010-10-121-0/+1
|
* Updated git ignore to ignore windows installer and new skin foldersMcCabe Maxsted2010-09-111-5/+3
|
* Added Windows installer files to .gitignore.Jacek Antonelli2010-06-261-1/+6
|
* Updated artwork package: added Mac and Linux cursors, and Mac icon.Jacek Antonelli2010-06-201-0/+1
| | | | Also updated .gitignore to ignore viewer.icns.
* Updated .gitignore to ignore all mozilla folders in app_settingsMcCabe Maxsted2010-04-191-1/+1
|
* ChangeLog.txt is now generated from the Git log at compile time.Jacek Antonelli2010-03-131-0/+2
| | | | | | It is no longer version controlled and should not be editted manually. Put '@nochangelog' in commit messages to omit them from the log. See linden/scripts/make_changelog.py for more information.
* Updated .gitignore to exclude some 1.3 files and folders on Windows.McCabe Maxsted2010-03-111-0/+6
| | | | @nochangelog
* ignore (makes github happy)Armin Weatherwax2009-12-131-1/+0
|
* Fixed a little mistake in .gitignore.Jacek Antonelli2009-11-291-2/+2
|
* Updated .gitignore.Jacek Antonelli2009-11-271-12/+16
|
* Added patch and .pyc files to .gitignoreMcCabe Maxsted2009-06-111-0/+7
|
* Added .gitignore to ignore artwork, libs, and compiled stuff.Jacek Antonelli2008-09-281-0/+43
generated by cgit v1.1 at 2024-05-19 17:01:36 +0000