Changeset 5048


Ignore:
Timestamp:
Feb 24, 2015, 5:45:39 PM (5 years ago)
Author:
ldelgass
Message:

merge r5047 from release branch

Location:
nanovis/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk

  • nanovis/trunk/Makefile.in

    r4949 r5048  
    207207resources       = \
    208208                $(srcdir)/resources/arrows.bmp \
    209                 $(srcdir)/resources/particle2.bmp \
    210209                $(srcdir)/resources/verdana.fnt \
    211210                $(srcdir)/resources/verdana_bold.fnt
     
    252251STATIC_LIBS +=  $(MAT_LIB)
    253252INCLUDES +=     $(MAT_INC_SPEC)
     253resources +=    $(srcdir)/resources/particle2.bmp
    254254shaders +=      $(srcdir)/shaders/pointsvp.cg
    255255endif
Note: See TracChangeset for help on using the changeset viewer.