Changeset 5bca4a8c


Ignore:
Timestamp:
Jun 14, 2010 11:59:29 AM (7 years ago)
Author:
Constantin <jucovschi@…>
Branches:
master, experimental, feature_CIS, feature_PetascopeSecore, feature_cmake, feature_rasdapy, feature_wcps2, fixes, release_8.5, release_9.0, release_9.1, release_9.2, release_9.3, release_9.4, release_9.5
Children:
ee46c5c, 8b2715b
Parents:
dd1ba9a (diff), 82821f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Constantin <jucovschi@…> (06/14/10 11:55:37)
git-committer:
Constantin <jucovschi@…> (06/14/10 11:59:29)
Message:

Merge branch 'master' of ssh://kahlua:9141/home/git/rasdaman

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rdd1ba9a r5bca4a8c  
    4646          raslib clientcomm servercomm rasodmg qlparser conversion \
    4747          mddmgr httpserver mymalloc time server rasmgr rascontrol rasdl \
    48           applications bin insertutils manuals_and_examples include java
     48          applications bin insertutils manuals_and_examples include
    4949
    5050all:
  • configure.ac

    r41f78a9 r5bca4a8c  
    132132                 insertutils/Makefile
    133133                 include/Makefile
    134                  java/Makefile
    135134          ])
    136135
Note: See TracChangeset for help on using the changeset viewer.