Don Kjer
|
7866356d77
|
Merge viewer-release => sunshine-internal
|
2013-10-29 13:20:18 +00:00 |
|
Oz Linden
|
035ab9f374
|
open-183: improve local build number generation to account for multiple heads
|
2013-09-05 11:41:19 -04:00 |
|
Brad Payne (Vir Linden)
|
144eb1912d
|
merge
|
2013-09-04 13:41:51 -04:00 |
|
Nyx Linden
|
5ae117aff6
|
merge with viewer-release
|
2013-08-16 19:31:16 -04:00 |
|
Oz Linden
|
a4966a6612
|
OPEN-182: correct tip rev number use in local build version generation
|
2013-07-16 17:38:26 -04:00 |
|
Nyx Linden
|
69b062b908
|
merge with viewer-release
|
2013-06-18 16:15:03 -04:00 |
|
Oz Linden
|
a3a933e212
|
fix local build numbers when compiling a merge before committing (two parents)
|
2013-06-04 12:33:51 -04:00 |
|
Brad Payne (Vir Linden)
|
a04a706c1b
|
merge
|
2013-05-21 16:18:48 -04:00 |
|
Oz Linden
|
70b0b2a2e3
|
revise test for hg to detect and ignore incorrect results from cygwin hg
|
2013-05-21 15:44:08 -04:00 |
|
Oz Linden
|
3bb708d706
|
merge up to latest viewer-development for merge to 3.5.2
|
2013-04-19 14:42:56 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Oz Linden
|
b0125b513c
|
add viewer channel to compile time feedback
|
2013-02-20 15:53:17 -05:00 |
|
Oz Linden
|
d7e90f4160
|
derive version number from indra/VIEWER_VERSION.txt
|
2013-02-07 11:56:57 -05:00 |
|
Bryan O'Sullivan
|
9db949eec3
|
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
2008-06-02 21:14:31 +00:00 |