commit f9919a1ea588649b20b5d19c9c3f161aa158a9c1
Merge: ef87887 e2b3a8f
Author: Erinn Clark <[email protected]>
Date: Mon Aug 13 23:02:10 2012 +0100
Merge branch 'maint-2.2'
README.LINUX-2.2 | 6 +++---
README.OSX-2.2 | 6 +++---
README.WIN-2.2 | 6 +++---
build-scripts/linux.mk | 2 +-
build-scripts/osx.mk | 2 +-
build-scripts/versions.mk | 8 ++++----
build-scripts/windows.mk | 2 +-
changelog.linux-2.2 | 8 ++++++++
changelog.osx-2.2 | 8 ++++++++
changelog.windows-2.2 | 8 ++++++++
10 files changed, 40 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
