vacp2p
/
minime
mirror of https://github.com/vacp2p/minime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:CharityDAO/minime

This commit is contained in:
Jordi Baylina 2016-11-14 11:50:06 +01:00
parent 3c2d336fed 13cbf0efea
commit 08bf4df3fd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MiniMeToken.sol
View File

@ -106,7 +106,7 @@ contract MiniMeToken is Controlled {
/// @param _tokenName Name of the new token /// @param _tokenName Name of the new token
/// @param _decimalUnits Number of decimals of the new token /// @param _decimalUnits Number of decimals of the new token
/// @param _tokenSymbol Token Symbol for the new token /// @param _tokenSymbol Token Symbol for the new token
/// @param _transfersEnabled If true, tokens will not be able to be transferred /// @param _transfersEnabled If true, tokens will be able to be transferred
function MiniMeToken( function MiniMeToken(
address _tokenFactory, address _tokenFactory,
address _parentToken, address _parentToken,
@ -334,8 +334,7 @@ contract MiniMeToken is Controlled {
/// @param _snapshotBlock Block when the distribution of the parent token is /// @param _snapshotBlock Block when the distribution of the parent token is
/// copied to set the initial distribution of the new clone token; /// copied to set the initial distribution of the new clone token;
/// if the block is higher than the actual block, the current block is used /// if the block is higher than the actual block, the current block is used
/// @param _transfersEnabled True if transfers are not allowed in the clone token /// @param _transfersEnabled True if transfers are allowed in the clone
/// if the block is higher than the actual block, the current block is used
/// @return The address of the new MiniMeToken Contract /// @return The address of the new MiniMeToken Contract
function createCloneToken( function createCloneToken(
string _cloneTokenName, string _cloneTokenName,
@ -399,8 +398,8 @@ contract MiniMeToken is Controlled {
//////////////// ////////////////
/// @notice Sets if the contract allows transfers or not /// @notice Enables token holders to transfer their tokens freely if true
/// @param _transfersEnabled false to don't allow transfers true to allow transfer /// @param _transfersEnabled True if transfers are allowed in the clone
function enableTransfers(bool _transfersEnabled) onlyController { function enableTransfers(bool _transfersEnabled) onlyController {
transfersEnabled = _transfersEnabled; transfersEnabled = _transfersEnabled;
} }