Beq
|
cef7c02325
|
Add simple script to allow parallel build of OS/SL
Not very clever script but avoids breaking anyone else (I hope). build_target.sh simply moves folder tress to one side making OS or SL the "target".
|
2020-10-10 01:39:14 +01:00 |
|
Kitty Barnett
|
cddc7cb040
|
Merge branch 'rlva/development'
|
2020-09-19 13:31:34 +02:00 |
|
Kitty Barnett
|
1c002e7c22
|
Pass address size to CMake via the platform parameter (see corresponding change in our autobuild)
|
2020-07-21 23:38:44 +02:00 |
|
Kitty Barnett
|
d11fee37b3
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-07-21 23:34:11 +02:00 |
|
Nicky Dasmijn
|
f116ea4cb7
|
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
|
2020-07-20 09:58:30 +02:00 |
|
Kitty Barnett
|
cb4b95b87b
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-06-27 11:11:00 +02:00 |
|
Nat Goodspeed
|
77cf4588df
|
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
|
2020-06-23 22:03:43 -04:00 |
|
Kitty Barnett
|
1bc3d1a186
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-06-09 15:33:40 +02:00 |
|
Nicky Dasmijn
|
7c7e3ae8ba
|
Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476
|
2020-06-03 19:28:05 +02:00 |
|
Ansariel
|
1b102c57db
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-06-03 12:30:37 +02:00 |
|
Callum Prentice
|
d4a38abdf5
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
|
2020-06-02 13:13:53 -07:00 |
|
Nat Goodspeed
|
50a8c2e41a
|
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
|
2020-06-02 16:05:56 -04:00 |
|
Ansariel
|
800eedb195
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-06-02 21:55:22 +02:00 |
|
Ansariel
|
77f56fa7bf
|
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
|
2020-05-31 15:27:02 +02:00 |
|
Nicky
|
4f634176dc
|
Add .tar.bz2 to .gitignore.
|
2020-05-30 01:36:09 +02:00 |
|
Nicky Dasmijn
|
27715d4d03
|
Merge remote-tracking branch 'll/d476' into fs-eep-vs2017-d476
|
2020-05-21 06:54:02 +02:00 |
|
Callum Prentice
|
27efc55cdb
|
Nonsensical, trivial change to force a build after I ran afoul of a TeamCity buildscripts change
|
2020-05-04 14:24:28 -07:00 |
|
Nicky Dasmijn
|
a4aff377e6
|
Merge branch 'master' into fs-vs2017
|
2020-04-29 20:02:19 +02:00 |
|
Ansariel
|
bc91debfd7
|
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
|
2020-04-10 18:37:27 +02:00 |
|
Nicky
|
cb4ca2e41e
|
Ignore build-vc150-* directories as those are the VS2017 build dirs (n.b. due to the rather strange version numbering of VS this really should be build-vc141-*; as VS2017 is vc141 internally).
|
2020-03-25 18:44:04 -04:00 |
|
Kitty Barnett
|
9afa7696c7
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-02-08 14:32:47 +01:00 |
|
Andrey Kleshchev
|
e76f25d25f
|
SL-11445 Couple small fixes
|
2020-02-04 16:19:20 +02:00 |
|
Ansariel
|
da41ae4917
|
Great job again, Git...
|
2020-01-29 00:05:10 +01:00 |
|
Ansariel
|
c8e0721bf5
|
Merge DRTVWR-496
|
2020-01-28 18:18:12 +01:00 |
|
Dave Houlton
|
1069673311
|
Convert ignore file to git, add a .clang-format rules file
|
2020-01-10 16:27:33 -07:00 |
|
Ansariel
|
f29362298c
|
Replace .gitignore with merged LL version
|
2020-01-08 18:04:40 +01:00 |
|
Dave Houlton
|
391976ffb2
|
Convert ignore file to git, add a .clang-format rules file
|
2020-01-07 15:34:08 -07:00 |
|
Nicky
|
7c9e7f4c03
|
Ignore *.orig files.
|
2019-12-29 20:56:12 +01:00 |
|
Kitty Barnett
|
9e0bbc4e10
|
Post-git conversion changes
|
2019-12-23 02:08:12 +01:00 |
|
Beq
|
cde80582c5
|
ignore my_autobuild.xml and .vscode detritus
|
2019-12-22 12:56:40 +00:00 |
|
Nicky Dasmijn
|
7f9bce5ada
|
Merge branch 'master' into fs-vs2017
|
2019-12-21 01:52:19 +01:00 |
|
Ansariel
|
c1a06438ba
|
Transition from .hgignore to .gitignore
|
2019-12-14 16:51:05 +01:00 |