ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-01 16:57:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '15.1.dev' of https://github.com/nasa/trick into 15.1.dev

Browse Source
This commit is contained in:
Alex Lin 2015-10-06 12:46:49 -05:00
commit 01a8294dd8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/java/src/trick/dataproducts/trickdp/utils/TrickDPActionController.java
View File

@ -409,7 +409,7 @@ public class TrickDPActionController {
String fileSeparator = System.getProperty("file.separator");
String pathSeparator = System.getProperty("path.separator");
String javaPath = UIUtils.getTrickHome() + fileSeparator + "bin" + fileSeparator + "java";
String javaPath = UIUtils.getTrickHome() + fileSeparator + "libexec/trick" + fileSeparator + "java";
String distPath = javaPath + fileSeparator + "dist";
String libPath = javaPath + fileSeparator + "lib";
String classPath = distPath + fileSeparator + "*" + pathSeparator +

2
trick_source/sim_services/DataRecord/src/DRHDF5.cpp
View File

@ -15,7 +15,7 @@ PROGRAMMERS:
#include "sim_services/Message/include/message_proto.h"
Trick::DRHDF5::DRHDF5( std::string in_name ) : Trick::DataRecordGroup(in_name) {
register_group_with_mm(this, "Trick::HDF5") ;
register_group_with_mm(this, "Trick::DRHDF5") ;
}
int Trick::DRHDF5::format_specific_header( std::fstream & out_stream ) {