Merge remote-tracking branch 'upstream/master' into feature/norm_assoc_type

This commit is contained in:
John P Mayer Jr 2015-04-07 21:55:32 -04:00
commit e33f083c99
2 changed files with 2 additions and 0 deletions

View File

@ -88,6 +88,7 @@ Feel free to add your project to this list if you happen to use **nalgebra**!
extern crate num; extern crate num;
extern crate rustc_serialize; extern crate rustc_serialize;
extern crate rand; extern crate rand;
extern crate num;
#[cfg(feature="arbitrary")] #[cfg(feature="arbitrary")]
extern crate quickcheck; extern crate quickcheck;

View File

@ -4,6 +4,7 @@ use num::Float;
use std::{f32, f64, i8, i16, i32, i64, u8, u16, u32, u64, isize, usize}; use std::{f32, f64, i8, i16, i32, i64, u8, u16, u32, u64, isize, usize};
use std::slice::{Iter, IterMut}; use std::slice::{Iter, IterMut};
use std::ops::{Add, Sub, Mul, Div, Rem, Index, IndexMut}; use std::ops::{Add, Sub, Mul, Div, Rem, Index, IndexMut};
use num::Float;
use traits::operations::{RMul, LMul, Axpy, Transpose, Inv, Absolute}; use traits::operations::{RMul, LMul, Axpy, Transpose, Inv, Absolute};
use traits::geometry::{Dot, Norm, Orig}; use traits::geometry::{Dot, Norm, Orig};