From ff0093460d50a2078f18192d6dcc75c76d72730c Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Sun, 23 Dec 2018 15:39:02 -0800
Subject: Export dutch auction wrapper in 0x.js

---
 packages/0x.js/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/0x.js/src/index.ts')

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index d21df0c01..ae9f4b771 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -4,6 +4,7 @@ export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtil
 
 export {
     ContractWrappers,
+    DutchAuctionWrapper,
     ERC20TokenWrapper,
     ERC721TokenWrapper,
     EtherTokenWrapper,
-- 
cgit v1.2.3


From edb989fbf381201752309a1e2aa5dcf6837b67d0 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Sun, 23 Dec 2018 16:04:09 -0800
Subject: export dutch auction wrapper types from 0x.js

---
 packages/0x.js/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/0x.js/src/index.ts')

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index ae9f4b771..790e2a97e 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -28,6 +28,7 @@ export {
     OrderAndTraderInfo,
     TraderInfo,
     ValidateOrderFillableOpts,
+    DutchAuctionData,
 } from '@0x/contract-wrappers';
 
 export {
@@ -89,6 +90,7 @@ export {
     ObjectMap,
     OrderRelevantState,
     Stats,
+    DutchAuctionDetails,
 } from '@0x/types';
 
 export {
-- 
cgit v1.2.3


From 04db7f0fae02ef29795d0f65deb71e64b5552233 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Mon, 7 Jan 2019 13:08:44 -0800
Subject: Fixed merge conflict from development

---
 packages/0x.js/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/0x.js/src/index.ts')

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 790e2a97e..006e4cf29 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -81,6 +81,7 @@ export {
     OrderStateInvalid,
     OrderState,
     AssetProxyId,
+    AssetData,
     SingleAssetData,
     ERC20AssetData,
     ERC721AssetData,
-- 
cgit v1.2.3