[tor-commits] [flashproxy/master] Merge remote-tracking branch 'aallai/url_reg'

[dcf at torproject.org]

commit f7db272603b3c447ce0fc52f142411c2135f9887
Merge: 85bd104 773a6fe
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 14 23:39:32 2013 -0700

    Merge remote-tracking branch 'aallai/url_reg'
    
    Conflicts:
    	Makefile

 Makefile                     |    2 +-
 doc/flashproxy-reg-url.1     |   78 ++++++++++++++++++++++++++++++++++++++++++
 doc/flashproxy-reg-url.1.txt |   58 +++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 1 deletions(-)

diff --cc Makefile
index 9483f75,c132c72..8d76772
--- a/Makefile
+++ b/Makefile
@@@ -5,10 -5,11 +5,10 @@@ BINDIR = $(PREFIX)/bi
  MANDIR = $(PREFIX)/share/man
  
  PYTHON = python
 -PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py
 -export PYINSTALLER_TMPDIR = pyinstaller-tmp
 +export PY2EXE_TMPDIR = py2exe-tmp
  
 -CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http
 +CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http flashproxy-reg-url
- CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1
+ CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 doc/flashproxy-reg-url.1
  CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc
  CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON