Back-merge
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sun, 21 Sep 2014 21:21:16 +0000 (14:21 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Sun, 21 Sep 2014 21:21:16 +0000 (14:21 -0700)
commit73662c7715417a45987ec5b56e4423040a757765
tree760ff3f60ae38e0b3b5c489e48140506641c407e
parentde90c6050bf6644a0b5fa03887ed2e9abd9f29b6
parente5cc609138a0bc4ce5177a67cf84952756d11b38
Back-merge

  define up-to-date all-in-one model for pascal finetuning
  load transform params in window data layer
  include WindowDataLayer in data param upgrade
  Fix typo in LRN-expression in docs
src/caffe/layers/window_data_layer.cpp