summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-13 17:59:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-13 17:59:33 -0400
commit80c4adc4954df5fb018f7b44cb54fa607bc6332f (patch)
treedd34eed6dd21ec7d869526fdbd3d6ff857948c4d
parent571cd1c57aeb4e8071b30caf529a0845e8ddc7cf (diff)
proof of concept remote reordering UI (needs to be changed to use drag and drop)
-rw-r--r--Assistant/Pairing/MakeRemote.hs1
-rw-r--r--debian/copyright5
2 files changed, 5 insertions, 1 deletions
diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs
index ff5688bd3..edd27e35a 100644
--- a/Assistant/Pairing/MakeRemote.hs
+++ b/Assistant/Pairing/MakeRemote.hs
@@ -12,7 +12,6 @@ import Assistant.Ssh
import Assistant.Pairing
import Assistant.Pairing.Network
import Assistant.MakeRemote
-import Config
import Config.Cost
import Network.Socket
diff --git a/debian/copyright b/debian/copyright
index 1791a0492..90ae279c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -91,6 +91,11 @@ License: MIT or GPL-2
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Files: static/jquery-ui*
+Copyright: © 2008 Paul Bakaus
+ © 2011 the jQuery UI Authors (http://jqueryui.com/about)
+License: GPL-2
+
Files: static/*/bootstrap* static/img/glyphicons-halflings*
Copyright: 2012 Twitter, Inc.
License: Apache-2.0