[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'
erinn at torproject.org
erinn at torproject.org
Sat Dec 14 18:45:12 UTC 2013
commit 6100d4c179b25efaba9cdcb7d7ec264e61e2e436
Merge: 4809165 fb7238f
Author: Erinn Clark <erinn at torproject.org>
Date: Sat Dec 14 16:45:41 2013 -0200
Merge branch 'maint-2.4'
README.LINUX-2.4 | 6 +-
README.LINUX-2.5 | 29 ++
README.OSX-2.4 | 6 +-
README.OSX-2.5 | 23 ++
README.WIN-2.4 | 6 +-
README.WIN-2.5 | 27 ++
build-scripts/config/Info.plist | 6 +-
build-scripts/config/Info.plist-stable | 6 +-
build-scripts/edit-changelog.sh | 4 +-
build-scripts/linux-alpha.mk | 2 +-
build-scripts/linux.mk | 2 +-
build-scripts/osx.mk | 2 +-
build-scripts/versions-alpha.mk | 8 +-
build-scripts/versions.mk | 8 +-
build-scripts/windows.mk | 2 +-
changelog.linux-2.4 | 319 +++++++++++++++++
changelog.linux-2.5 | 592 ++++++++++++++++++++++++++++++++
changelog.osx-2.4 | 299 ++++++++++++++++
changelog.osx-2.5 | 561 ++++++++++++++++++++++++++++++
changelog.windows-2.4 | 297 ++++++++++++++++
changelog.windows-2.5 | 557 ++++++++++++++++++++++++++++++
21 files changed, 2733 insertions(+), 29 deletions(-)
More information about the tor-commits
mailing list