608403a846
merge changes for vwr-26458
2011-08-09 10:22:04 -04:00
fc0166380b
merge changes for storm-1473
2011-08-09 10:21:07 -04:00
4ff281ab94
merge changes for storm-1436
2011-08-09 10:20:41 -04:00
f8c6283f4c
merge changes for storm-1309
2011-08-09 10:20:20 -04:00
554159416f
merge changes for storm-1540
2011-08-09 10:19:45 -04:00
4405c74f71
merge changes for storm-1194
2011-08-09 10:19:21 -04:00
53efce5b5a
merge changes for storm-1186
2011-08-09 10:18:43 -04:00
4ab5831b3e
increment viewer version to 3.0.1
2011-08-08 11:13:15 -04:00
1722790ab6
Added tag 3.0.0-start for changeset 6b678ea52f90
2011-08-08 11:08:53 -04:00
8053f7a5b0
correct xml syntax error
2011-08-08 11:08:33 -04:00
7c7038136e
correct version number typo
2011-08-08 10:58:52 -04:00
f30680cce9
correct merge-induced error in settings.xml
2011-08-08 10:56:32 -04:00
09dc3fd81b
merge back beta tags
2011-08-08 10:08:22 -04:00
33fa30f526
merge back release tag
2011-08-08 10:06:12 -04:00
fb2733942c
increment viewer version to 3.0.0
2011-08-08 09:16:01 -04:00
0d085e90ac
merge changes for storm-1060
2011-08-08 09:14:36 -04:00
8c5da0552d
merged .hgtags
2011-08-05 19:09:28 -04:00
8675901fa8
Added tag DRTVWR-75_2.8.3-beta1, 2.8.3-beta1 for changeset 599677276b22
2011-08-05 19:07:06 -04:00
d456006f9a
remove override for channel testing
2011-08-05 16:23:31 -04:00
38e18cd69c
undo Mac app name change (again)
2011-08-05 13:28:29 -04:00
24f88cfe19
Merging STORM-565
2011-08-05 19:30:12 +03:00
2539f8918e
STORM-1540 FIXED Fixed missing and duplicated names in floater_build_options.xml and floater_model_wizard.xml.
2011-08-05 19:11:39 +03:00
a3a7861874
undo Mac app name change
2011-08-05 11:59:57 -04:00
661601a99a
STORM-1309 WIP Fixed maturity rating icon overlapping the floater right border.
...
The code that places it now takes into account possible text truncation.
2011-08-05 17:45:32 +03:00
72e5b40e93
STORM-1309 WIP Proper truncation of region type, estate name and estate owner text.
...
* Use ellipses for truncation.
* Where applicable, set tooltip to contain the uncut text.
* Leave a few pixels of padding between the text and the floater right border.
LLView::getChild<T>() never returns NULL, so no need to check its return value.
2011-08-05 17:42:46 +03:00
c8d86e062c
STORM-1309 WIP Fixed timestamp (last modified date) value truncation.
2011-08-05 17:23:10 +03:00
0c2e949c6c
change parameters to test build for release
2011-08-05 10:18:02 -04:00
1e9d7e8cd0
STORM-1309 WIP Appended a space after the colon in "Last modified:".
...
It seems to have been mistakenly omitted by translators.
2011-08-05 17:17:05 +03:00
e3114a8695
remove parameter used in test builds
2011-08-04 19:31:50 -04:00
812ad1b679
merge changes for SH-2218
2011-08-04 18:58:21 -04:00
7740691bf9
merge changes for SH-2218
2011-08-04 18:57:19 -04:00
6c61a53791
Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999
2011-08-04 17:28:43 -04:00
aeb1f944aa
storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used
2011-08-04 16:52:19 -04:00
f42df4cd9f
merge changes for storm-1538
2011-08-04 15:39:33 -04:00
94c171d89b
merge changes for storm-1355
2011-08-04 15:37:31 -04:00
4ba18501ea
merge changes for storm-1458
2011-08-04 15:36:26 -04:00
57fec33490
merge changes for storm-1291
2011-08-04 15:30:11 -04:00
5aa1521625
fix path choice for project branches, attempt to fix linux icon
2011-08-04 11:52:32 -04:00
1b46240ed8
correct default channel
2011-08-04 11:14:18 -04:00
7714f05e62
merge back disabling of watchdog
2011-08-04 11:13:30 -04:00
9963e9aaac
fix license headers
2011-08-04 11:00:53 -04:00
3369ebc8dd
fix DOS line endings
2011-08-04 10:57:03 -04:00
ca3cea390c
merge changes for storm-1537 : releasable mesh branch
2011-08-04 09:12:08 -04:00
2fcf7bc6d7
storm-1060 (temporary) adjust build params for icon selection test
2011-08-04 09:01:36 -04:00
4877bb536e
storm-1060 (partial) : update icon selection for Mac and Linux builds
2011-08-04 08:52:32 -04:00
017a23aaf4
SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use other applications
...
* Just removed mac memory stats to make a low-risk work-around.
2011-08-03 17:07:49 -07:00
299e18e588
Automated merge with file:///Users/oz/Work/V-PR
2011-08-03 14:13:12 -04:00
1d9fe077a6
re-re-re-enable watchdog
2011-08-02 19:40:44 -04:00
63fe879065
merge back late beta fixes
2011-08-02 19:39:44 -04:00
f2193ce7e0
merge back late release fix
2011-08-02 19:39:27 -04:00
Oz Linden