Importing AFNI 0.20140926~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: 656223e48e589dc05e27de683d5e4983
AFNI claimed to be version: 0.20111221.1014
automated merge of fresh upstream
Importing AFNI 0.20140930~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: 476cf5e38748deb20bbcb16aae69aaff
AFNI claimed to be version: 0.20111221.1014
automated merge of fresh upstream
accounted in AFNIio.R for the rename R_io.so -> librio.so in our build
make explicit spec for upstream tag + we are at -1 still with new upstream snapshot
Importing AFNI 0.20141029~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: fbcd7168c4c3e39afb1146934b69b034
AFNI claimed to be version: 0.20111221.1014
automated merge of fresh upstream
Importing AFNI 0.20141105~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: 9e4e8e3407dda76c6bccc0ed8822f5a0
AFNI claimed to be version: 0.20111221.1014
automated merge of fresh upstream
Importing AFNI 0.20141107~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: fb7b73bc4d4360ede9dcb2d38e6a5e3c
AFNI claimed to be version: 0.20111221.1014
automated merge of fresh upstream
Merge commit '0.20140910_dfsg.1-14-g2d504ba'

* commit '0.20140910_dfsg.1-14-g2d504ba':
  Importing AFNI 0.20141107~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: fb7b73bc4d4360ede9dcb2d38e6a5e3c AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20141105~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 9e4e8e3407dda76c6bccc0ed8822f5a0 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20141029~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: fbcd7168c4c3e39afb1146934b69b034 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140930~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 476cf5e38748deb20bbcb16aae69aaff AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140926~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 656223e48e589dc05e27de683d5e4983 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140925~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: ad7e2215acde9b60217d469e53e515d4 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140924~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: c601c7dbd647c8e9f2e9d15bc8e47a49 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140923~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 08b293c8a82628cbf18a81f3b1e37649 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140922~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 59201cac9a6e01610eda7a0996b9ba1c AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140919~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: aee0e9dcca9cbab68b6a1b093d797839 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140918~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 222e3bceb5a9171a8fdda81278177c81 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140917~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 8c91a3518c929c456165ef76d4c6ca1e AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140916~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: a272859297038b6a041158d7df1e85d7 AFNI claimed to be version: 0.20111221.1014
  Importing AFNI 0.20140912~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: 8db98687f0bc871887bd4d4b63e3897b AFNI claimed to be version: 0.20111221.1014
changelog and patches updated
Merge branch 'master' into testing

* master:
  changelog and patches updated
  make explicit spec for upstream tag + we are at -1 still with new upstream snapshot
  accounted in AFNIio.R for the rename R_io.so -> librio.so in our build

Conflicts:
	debian/changelog
Importing AFNI 0.20141118~dfsg.1
Imported from tarball: afni_src.tgz
Original MD5: ed80fdd0d9c6df1cbf2fad6a0248de60
AFNI claimed to be version: 0.20111221.1014
Merge tag '0.20141118_dfsg.1'

0.20141118~dfsg.1

* tag '0.20141118_dfsg.1':
  Importing AFNI 0.20141118~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: ed80fdd0d9c6df1cbf2fad6a0248de60 AFNI claimed to be version: 0.20111221.1014
debian/patches/cmake_sharedlibs  was split into two (-noncmake and -cmake) with cmake files being only in -cmake one while -noncmake containing sattelite patches
cmake_sharedlibs-cmake  updated for introduced few new files
Merge branch 'master' into testing

* master:
  cmake_sharedlibs-cmake  updated for introduced few new files
  debian/patches/cmake_sharedlibs  was split into two (-noncmake and -cmake) with cmake files being only in -cmake one while -noncmake containing sattelite patches
  Importing AFNI 0.20141118~dfsg.1 Imported from tarball: afni_src.tgz Original MD5: ed80fdd0d9c6df1cbf2fad6a0248de60 AFNI claimed to be version: 0.20111221.1014