ComputationalRadiationPhysics / isaac

In Situ Animation of Accelerated Computations :microscope:
http://ComputationalRadiationPhysics.github.io/isaac/
GNU Lesser General Public License v3.0
25 stars 15 forks source link

Post 1.4.0: Merge Back master #82

Closed ax3l closed 5 years ago

ax3l commented 5 years ago

Just merging back master to dev to synchronize git histories after the 1.4.0 release.

psychocoderHPC commented 5 years ago

@ax3l can we solve this conflict on the terminal elese it will create a commit to the master.

ax3l commented 5 years ago

uh, weird. let me do this manually I was playing to much GUI.