Merge branch 'master' of https://github.com/transmission/transmission

extras/rpc-spec.txt

@@ -807,7 +807,7 @@
          |         | yes       | session-get          | new arg "session-id"
          |         | yes       | torrent-get          | new arg "labels"
          |         | yes       | torrent-set          | new arg "labels"
-         |         | yes       | torrent-set          | new arg "editDate"
+         |         | yes       | torrent-get          | new arg "editDate"
          |         | yes       | torrent-get          | new arg "format"
 
 

libtransmission/Makefile.am

@@ -316,3 +316,6 @@ watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS)
 rename_test_SOURCES = rename-test.c $(TEST_SOURCES)
 rename_test_LDADD = ${apps_ldadd}
 rename_test_LDFLAGS = ${apps_ldflags}
+
+EXTRA_DIST = \
+  subprocess-test.cmd

macosx/Makefile.am

@@ -95,6 +95,8 @@ EXTRA_DIST = \
     InfoTabButtonBack.m \
     InfoTabButtonCell.h \
     InfoTabButtonCell.m \
+    InfoTabMatrix.h \
+    InfoTabMatrix.m \
     InfoTextField.h \
     InfoTextField.m \
     InfoActivityViewController.h \

po/LINGUAS

@@ -68,6 +68,7 @@ pa
 pl
 pt
 pt_BR
+pt_PT
 ro
 ru
 si

third-party/Makefile.am

@@ -22,5 +22,8 @@ SUBDIRS = \
   $(UTP_DIR)
 
 EXTRA_DIST = \
+  curl \
+  libevent \
+  openssl \
   macosx-libevent-config.h \
   macosx-libevent-event-config.h