summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-17 16:52:19 +0000
committerDon Kjer <don@lindenlab.com>2012-07-17 16:52:19 +0000
commitcff3469d46d297fbec34bc0d648588e900cd255c (patch)
treed768ddbc8712c9e81387ae4b03dd8227229a0fe1 /indra/newview/CMakeLists.txt
parent5a473a42a63d3277c65bb3bc96e49f020508cfe8 (diff)
parent509408f393b8eb58799678adde801675a4d4d600 (diff)
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--[-rwxr-xr-x]indra/newview/CMakeLists.txt0
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5a1055319a..5a1055319a 100755..100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt