commit 45a9555ebc91eb145363f5b7ce007e56b30bd2ec Merge: 45924cf 5902268 Author: Alexandre Allaire <alexandre.allaire@mail.mcgill.ca> Date: Sat Nov 17 13:16:33 2012 -0500 Merge branch 'make_exe' of https://github.com/aallai/flashproxy into make_exe Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)