Merge branch 'otp'
authorChristopher Piro <cpiro@apache.org>
Tue, 2 Oct 2007 00:05:04 +0000 (00:05 +0000)
committerChristopher Piro <cpiro@apache.org>
Tue, 2 Oct 2007 00:05:04 +0000 (00:05 +0000)
commitc7fd7639b7a4fbfd5948d9c552baf118bc94c3c3
treead1821a19f6391c8455b244a1bc90000e4ee61dc
parent77575e69bbb9a8bc4b7d392abec781150c4cb039
Merge branch 'otp'

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665282 13f79535-47bb-0310-9956-ffa450edef68
lib/erl/include/thrift.hrl
lib/erl/include/thrift_logger.hrl [deleted file]
lib/erl/src/Makefile
lib/erl/src/oop.erl
lib/erl/src/thrift.app.src
lib/erl/src/thrift.erl
lib/erl/src/thrift_logger.erl
lib/erl/src/transport/tSocket.erl