Merge branch 'master' of https://github.com/pjreddie/darknet

Joseph Redmon

2016-06-23 d7fd2acf0582020de87f49d8863d39d1744a858c

 src/network.h

@@ -34,6 +34,7 @@
    float *scales;
    int   *steps;
    int num_steps;
    int burn_in;

    int inputs;
    int h, w, c;