From f9a6e31c763a32215819291bd21e792e03fb95dc Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 29 Jun 2021 16:51:28 -0400 Subject: SL-15500: A couple further tweaks to satisfy commit policy checker. --- indra/edit-me-to-trigger-new-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/edit-me-to-trigger-new-build.txt') diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index 5366987cff..ade83202cf 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1,3 +1,3 @@ euclid 5/29/2020 euclid 7/23/2020 -euclid 4/29/2021 \ No newline at end of file +euclid 4/29/2021 -- cgit v1.2.3 From adcd08fbf4d96f8f52cef81895bda202c9e45896 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 28 Sep 2021 19:07:48 +0300 Subject: Revert "Merge branch 'c++17' into DRTVWR-522-maint" This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp --- indra/edit-me-to-trigger-new-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/edit-me-to-trigger-new-build.txt') diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index ade83202cf..5366987cff 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1,3 +1,3 @@ euclid 5/29/2020 euclid 7/23/2020 -euclid 4/29/2021 +euclid 4/29/2021 \ No newline at end of file -- cgit v1.2.3 From 70551782f1c4627f9a7b75c720b0d1d8499bcbb0 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Tue, 28 Sep 2021 19:44:52 +0300 Subject: DRTVWR-545 New line for the coding policy check --- indra/edit-me-to-trigger-new-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/edit-me-to-trigger-new-build.txt') diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index 5366987cff..ade83202cf 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1,3 +1,3 @@ euclid 5/29/2020 euclid 7/23/2020 -euclid 4/29/2021 \ No newline at end of file +euclid 4/29/2021 -- cgit v1.2.3