aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-07-06 14:29:56 +0800
committerGitHub <noreply@github.com>2018-07-06 14:29:56 +0800
commit03b3d74748a6328ac9637ca4e176a316ca347704 (patch)
treee7d98700e0a5b957048f50c5b5d2c5dfba5216a1 /packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
parentd975c0cef34d126ce30202610671a6f8dca6b6c0 (diff)
parent0557d6a9bfc07b8d360970ffbcf582f8a26943cb (diff)
downloaddexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.gz
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.bz2
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.lz
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.xz
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.zst
dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.zip
Merge pull request #522 from 0xProject/feature/contracts/forwarder
Forwarding contract
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
index 5ab7aa63f..9e63dc1c0 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
@@ -397,7 +397,7 @@ contract MixinExchangeCore is
return fillResults;
}
- /// @dev Settles an order by transferring assets between counterparties.
+ /// @dev Settles an order by transferring assets between counterparties.
/// @param order Order struct containing order specifications.
/// @param takerAddress Address selling takerAsset and buying makerAsset.
/// @param fillResults Amounts to be filled and fees paid by maker and taker.