summaryrefslogtreecommitdiff
path: root/pwx
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2018-03-29 07:53:20 +0200
committerSven Eden <yamakuzure@gmx.net>2018-03-29 07:53:20 +0200
commit2cf68b85429bf1700e0d617ff0b31b14611dad66 (patch)
treef82fe8cb09a92444855cbc4ce000d2b9be5f41ac /pwx
parentf54f5cd0dde625f9f7d9e89abb24414f2592fa2e (diff)
Prep v236.1: To catch up with upstream, already branch out v236-stable.
Diffstat (limited to 'pwx')
-rw-r--r--pwx/pwx_last_mutual_commits.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/pwx/pwx_last_mutual_commits.txt b/pwx/pwx_last_mutual_commits.txt
index 418e1ba27..f4399f8b3 100644
--- a/pwx/pwx_last_mutual_commits.txt
+++ b/pwx/pwx_last_mutual_commits.txt
@@ -7,5 +7,6 @@ v232-stable 79a5d862a7abe903f456a75d6d1ca3c11adfa379
v233-stable 589fa9087a49e4250099bb6a4cf00358379fa3a4
master 265710c2055254a98ed6dcd6aa172ca509a33553
master-last efaa3176ad0e763a0fafd4519d4391813a88ba0e
+v236-stable 590171d1c956ac3b073bc73a7ca1f5529b01ab83
v236 83fefc8888620ce27ba39d906bd879bbcb6bc84e
v236-last f78a88beca362e62ca242499950a097fbcdb10d2