Skip to content

Commit

Permalink
Merge branch 'sigar-1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
dougm committed Apr 28, 2010
2 parents 57402b2 + 2378412 commit f2b8f76
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions bindings/java/hyperic_jni/jni-build.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<!--
Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
This file is part of SIGAR.
SIGAR is free software; you can redistribute it and/or modify
it under the terms version 2 of the GNU General Public License as
published by the Free Software Foundation. This program is distributed
in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more
details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
Copyright (c) 2009 Hyperic, Inc.
Copyright (c) 2009 SpringSource, Inc.
Copyright (c) 2009-2010 VMware, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<property environment="env"/>
Expand Down

0 comments on commit f2b8f76

Please sign in to comment.