summaryrefslogtreecommitdiff
path: root/indra/win_updater
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-30 21:28:02 +0000
committerMonty Brandenberg <monty@lindenlab.com>2013-05-30 21:28:02 +0000
commitd6d2159bf875884bb060aaf8234478dd1ec478b4 (patch)
tree6873979584b8d269fb250c35219725598cb9b5d6 /indra/win_updater
parent960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
Merge. Pull in viewer-release reflecting new release structure.
Diffstat (limited to 'indra/win_updater')
-rwxr-xr-x[-rw-r--r--]indra/win_updater/CMakeLists.txt0
-rwxr-xr-x[-rw-r--r--]indra/win_updater/updater.cpp0
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index 210486c668..210486c668 100644..100755
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
diff --git a/indra/win_updater/updater.cpp b/indra/win_updater/updater.cpp
index aeab5a3b13..aeab5a3b13 100644..100755
--- a/indra/win_updater/updater.cpp
+++ b/indra/win_updater/updater.cpp