Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2998

Timestamp:

Aug 11, 2017 2:15:36 PM (6 years ago)

Author:

toby

Message:

merge trunk into 2frame

Files:

: 12 edited

Binaries/mac_32_p2.7_n1.6 (modified) (1 prop)
branch/2frame (modified) (1 prop)
branch/2frame/AllBinaries (modified) (1 prop)
branch/2frame/GSASII.py (modified) (1 prop)
branch/2frame/GSASIIobj.py (modified) (1 prop)
branch/2frame/GSASIIpath.py (modified) (1 prop)
branch/2frame/GSASIIphsGUI.py (modified) (1 prop)
branch/2frame/GSASIIplot.py (modified) (1 prop)
branch/2frame/GSASIIstrMain.py (modified) (1 prop)
branch/2frame/GSASIIstrMath.py (modified) (1 prop)
branch/2frame/exports (modified) (1 prop)
branch/2frame/gltext.py (modified) (1 prop)

Binaries/mac_32_p2.7_n1.6
- Property svn:mergeinfo set to
  /trunk/bindist merged eligible
branch/2frame
- Property svn:mergeinfo set to
  /trunk merged non-inheritable eligible
branch/2frame/AllBinaries
- Property svn:mergeinfo set to
  /trunk/AllBinaries merged eligible
branch/2frame/GSASII.py
- Property svn:mergeinfo set to
  /trunk/GSASII.py merged eligible
branch/2frame/GSASIIobj.py
- Property svn:mergeinfo set to
  /trunk/GSASIIobj.py merged eligible
branch/2frame/GSASIIpath.py
- Property svn:mergeinfo set to
  /trunk/GSASIIpath.py merged eligible
branch/2frame/GSASIIphsGUI.py
- Property svn:mergeinfo set to
  /trunk/GSASIIphsGUI.py merged eligible
branch/2frame/GSASIIplot.py
- Property svn:mergeinfo set to
  /trunk/GSASIIplot.py merged eligible
branch/2frame/GSASIIstrMain.py
- Property svn:mergeinfo set to
  /trunk/GSASIIstrMain.py merged eligible
branch/2frame/GSASIIstrMath.py
- Property svn:mergeinfo set to
  /trunk/GSASIIstrMath.py merged eligible
branch/2frame/exports
- Property svn:mergeinfo set to
  /trunk/exports merged eligible
branch/2frame/gltext.py
- Property svn:mergeinfo set to
  /trunk/gltext.py merged eligible

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: