]> granicus.if.org Git - graphviz/log
graphviz
8 years agoResolve 7 -Wconversion warnings in htmllex.c
Erwin Janssen [Thu, 1 Sep 2016 19:38:20 +0000 (21:38 +0200)]
Resolve 7 -Wconversion warnings in htmllex.c

The return value of `toupper` can be safely cast to a char, as long as the input of `toupper` is actually a char.

8 years agoResolve 7 warnings in colxlate.c
Erwin Janssen [Thu, 1 Sep 2016 19:18:16 +0000 (21:18 +0200)]
Resolve 7 warnings in colxlate.c

In three function, the type of two local variables could safely be changed to `size_t`.

8 years agoResolved two warnings in arrows.c
Erwin Janssen [Thu, 1 Sep 2016 18:01:01 +0000 (20:01 +0200)]
Resolved two warnings in arrows.c

The local variable `namelen` is always positive, so the type `size_t` could be used.

8 years agoResolved one -Wsign-conversion in cvt.c
Erwin Janssen [Thu, 1 Sep 2016 17:26:25 +0000 (19:26 +0200)]
Resolved one -Wsign-conversion in cvt.c

There are multiple -Wsign-conversion warnings, but only one could be resolved without analysing or changing more than a few lines of code.

8 years agoResolved four -Wsign-conversion in rec.c
Erwin Janssen [Thu, 1 Sep 2016 17:09:30 +0000 (19:09 +0200)]
Resolved four -Wsign-conversion in rec.c

`arg_rec_size` is always positive, so it can be an unsigned integer.

8 years agoResolve four warnings in grammar.y
Erwin Janssen [Thu, 1 Sep 2016 16:41:48 +0000 (18:41 +0200)]
Resolve four warnings in grammar.y

Setting the proper type for `len` resolved them.

8 years agoResolve one Wsign-conversion in attr.c
Erwin Janssen [Thu, 1 Sep 2016 13:05:09 +0000 (15:05 +0200)]
Resolve one Wsign-conversion in attr.c

This cast that resolves this warning does not change the sign of `sz`, because the if statement above it makes sure it isn't a negative number.

8 years agoResolve three Wsign-conversion in agxbuf.c
Erwin Janssen [Thu, 1 Sep 2016 12:55:19 +0000 (14:55 +0200)]
Resolve three Wsign-conversion in agxbuf.c

These three warnings could be resolved without making functional changes in the code. Also initialized the three local variables in this function to zero.

8 years agoconvert 'unsigned long' to 'uint64_t' for Windows portability untagged-4bd8dcccfa75989e4d17
John Ellson [Tue, 23 Aug 2016 14:45:02 +0000 (10:45 -0400)]
convert 'unsigned long' to 'uint64_t' for Windows portability

8 years agoMerge pull request #1151 from arjamizo/master untagged-5b049c6cdfd083f5dbf2
John Ellson [Mon, 22 Aug 2016 23:49:46 +0000 (19:49 -0400)]
Merge pull request #1151 from arjamizo/master

fix typo TB->BT in docs:shapes

8 years agofix typo TB->BT in docs:shapes
arjamizo [Mon, 22 Aug 2016 14:43:27 +0000 (16:43 +0200)]
fix typo TB->BT in docs:shapes

8 years agoReplace cluster with subgraph, as the output will also reflect non-cluster untagged-f6bbc5576feb1e03c4b8
Emden R. Gansner [Fri, 19 Aug 2016 11:04:25 +0000 (07:04 -0400)]
Replace cluster with subgraph, as the output will also reflect non-cluster
subgraphs.

8 years agoAdd schema for dot output in json format. untagged-0dc7cf263f66ae1825bb
Emden R. Gansner [Thu, 18 Aug 2016 00:36:28 +0000 (20:36 -0400)]
Add schema for dot output in json format.

8 years agoMerge pull request #1150 from ErwinJanssen/configure-ac untagged-1bc5df88610db337fc67
John Ellson [Wed, 17 Aug 2016 13:11:10 +0000 (09:11 -0400)]
Merge pull request #1150 from ErwinJanssen/configure-ac

Removed POSIX version flag from configure.ac

8 years agoRemoved POSIX version flag from configure.ac
Erwin Janssen [Wed, 17 Aug 2016 11:31:02 +0000 (13:31 +0200)]
Removed POSIX version flag from configure.ac

With the new way of enabling C99 (`AC_PROG_CC_C99` instead of `-std=c99`) this flag is no longer needed for a successfull compilation.

8 years agoel5 breakage, need , in dist target, but not in install target untagged-383680da5ca9da9f5250
John Ellson [Tue, 16 Aug 2016 17:18:55 +0000 (13:18 -0400)]
el5 breakage, need ,  in dist target, but not in install target

8 years agoremove -D_POSIX_C_SOURCE=200112L as it breaks ./configure test for php.h untagged-d177ed11e0540b07902a
John Ellson [Tue, 16 Aug 2016 16:03:03 +0000 (12:03 -0400)]
remove -D_POSIX_C_SOURCE=200112L as it breaks ./configure test for php.h

8 years agoMerge branch 'master' of github.com:/ellson/graphviz untagged-95487e465cf6bdb4c605
John Ellson [Mon, 15 Aug 2016 20:21:54 +0000 (16:21 -0400)]
Merge branch 'master' of github.com:/ellson/graphviz

8 years agodisable php in fedora24 till we can work out what broke
John Ellson [Mon, 15 Aug 2016 20:21:38 +0000 (16:21 -0400)]
disable php in fedora24 till we can work out what broke

8 years agotry updating php includedirs to match php-config --includes
John Ellson [Mon, 15 Aug 2016 20:21:02 +0000 (16:21 -0400)]
try updating php includedirs to match php-config --includes

8 years ago build manpages unconditionally on Travis hsost
John Ellson [Mon, 15 Aug 2016 18:12:35 +0000 (14:12 -0400)]
 build manpages unconditionally on Travis hsost

8 years agoMerge pull request #1149 from ErwinJanssen/improve-travis untagged-950e8f23afa87abe4973
John Ellson [Sat, 13 Aug 2016 16:55:44 +0000 (12:55 -0400)]
Merge pull request #1149 from ErwinJanssen/improve-travis

Improve Travis + deploy make dist results

8 years agoSmall formatting change. untagged-0aac90e5c2817176609d
Emden Gansner [Sat, 13 Aug 2016 12:51:45 +0000 (08:51 -0400)]
Small formatting change.

8 years agoEdges attached to a cluster were not getting assigned an index number. untagged-c6ce5b1f17878d776124
Emden Gansner [Fri, 12 Aug 2016 21:18:29 +0000 (17:18 -0400)]
Edges attached to a cluster were not getting assigned an index number.

8 years agoquote as it contains spaces when No untagged-1aed90cbe517038de3a0
John Ellson [Wed, 10 Aug 2016 19:00:14 +0000 (15:00 -0400)]
quote  as it contains spaces when No

8 years agosuppress "unused parameter" warning during ./configure
John Ellson [Wed, 10 Aug 2016 18:55:19 +0000 (14:55 -0400)]
suppress "unused parameter" warning during ./configure

8 years agoTravis: deploy result of `make dist`
Erwin Janssen [Wed, 10 Aug 2016 09:13:40 +0000 (11:13 +0200)]
Travis: deploy result of `make dist`

Every commit will still result in a new untagged release on Github, but the results of `make dist` will now be attached to these releases.

8 years agoTravis: clean build steps.
Erwin Janssen [Wed, 10 Aug 2016 08:37:12 +0000 (10:37 +0200)]
Travis: clean build steps.

Because the results of `make install` when using a prefix aren't binaries suitable to be released, some build steps can either be removed or simpified.

8 years agoTravis: color gcc output
Erwin Janssen [Wed, 10 Aug 2016 08:12:25 +0000 (10:12 +0200)]
Travis: color gcc output

Use colorgcc to add color to the output of gcc. This improves readability and makes it easier to find warnings.

8 years agoMerge pull request #1148 from ErwinJanssen/unit-test untagged-27ff95768eb6958bcef7
John Ellson [Tue, 9 Aug 2016 15:52:33 +0000 (11:52 -0400)]
Merge pull request #1148 from ErwinJanssen/unit-test

Introduction unit test for current commnand line behavior

8 years agoTests added for current behaviour command line.
Erwin Janssen [Mon, 8 Aug 2016 13:49:04 +0000 (15:49 +0200)]
Tests added for current behaviour command line.

This commit adds some tests that "document" the current behavior of the command line interface. When refactoring command line interface (like the parsing code), the observable behavior of the command line interface should stay the same, this is to ensure backwards compatibility. These tests are a start, it covers some basic command line operations (printing the version and usage), but show some interesting things. Mainly that the order of the flags is very important.

- `dot -Vrandom` prints the version, but `dot -randomV` causes an error.
- `dot -?V` prints the usage, but `dot -V?` prints the version.

While it may be desirable to change this, when refactoring this behavior should stay the same. Changing the existing interface should be done in Graphviz 3.

8 years agoTravis: Install Criterion
Erwin Janssen [Mon, 8 Aug 2016 10:08:42 +0000 (12:08 +0200)]
Travis: Install Criterion

Adds the installation of Criterion to the `install` step in the Travis configuration. A submodule is used so changes in the Criterion repository can't break the build. A submodule points to a specific commit.

8 years agoSimple unit test added.
Erwin Janssen [Mon, 8 Aug 2016 09:59:34 +0000 (11:59 +0200)]
Simple unit test added.

This unit test serves to validate the configuration and installation of the Criterion unit testing framework. This test will only be compiled and run if Criterion is installed.

8 years agoCheck for unit test framework in configure.ac
Erwin Janssen [Mon, 8 Aug 2016 09:21:55 +0000 (11:21 +0200)]
Check for unit test framework in configure.ac

Criterion is a unit testing framework for C and C++ and it's C99 compatible. It allows for fast test writing because, unlike a lot of other C unit test frameworks, it doesn't require a lot of boilerplate code.

This check in configure.ac checks if Criterion is installed on the system.

8 years agoMerge pull request #1147 from GadgetSteve/master untagged-cf3150dc2db96b5bb4d6
John Ellson [Mon, 1 Aug 2016 04:07:57 +0000 (00:07 -0400)]
Merge pull request #1147 from GadgetSteve/master

Changed README.md reference github for documentation.

8 years agoChanges to README.md to reference github for documentation
Steve Barnes [Sun, 31 Jul 2016 14:18:21 +0000 (15:18 +0100)]
Changes to README.md to reference github for documentation

Adresses #88 and #77.

8 years agoMerge pull request #3 from ellson/master
Steve (Gadget) Barnes [Sun, 31 Jul 2016 13:55:43 +0000 (14:55 +0100)]
Merge pull request #3 from ellson/master

Sync with master

8 years agosome -W flags not available on centos[56] untagged-749ecd6837d5c822253e
John Ellson [Wed, 27 Jul 2016 08:21:31 +0000 (04:21 -0400)]
some -W flags not available on centos[56]

8 years agoFix bug in printing error message about graphs with loops or multiedges; note port... untagged-282a92de118059697b67
Emden Gansner [Tue, 26 Jul 2016 16:23:16 +0000 (12:23 -0400)]
Fix bug in printing error message about graphs with loops or multiedges; note port restriction in
man page.

8 years agocgraph is not a configure option these days untagged-3443de97cd58035a8aea
John Ellson [Tue, 26 Jul 2016 00:39:50 +0000 (20:39 -0400)]
cgraph is not a configure option these days

8 years agoimprove handling of extra warnings if C99 available
John Ellson [Tue, 26 Jul 2016 00:37:54 +0000 (20:37 -0400)]
improve handling of extra warnings if C99 available

8 years agomore incompatible warning switches untagged-f5823de05291db506275
John Ellson [Mon, 25 Jul 2016 21:15:06 +0000 (17:15 -0400)]
more incompatible warning switches

8 years ago-Wtrampolines -Wdouble-promotion - cause errors on older (centos[56]) compilers
John Ellson [Mon, 25 Jul 2016 21:06:48 +0000 (17:06 -0400)]
-Wtrampolines -Wdouble-promotion  - cause errors on older (centos[56]) compilers

8 years agoMerge pull request #1145 from ErwinJanssen/refactor untagged-9ee5934fa10f12b4043f
John Ellson [Fri, 22 Jul 2016 18:54:51 +0000 (14:54 -0400)]
Merge pull request #1145 from ErwinJanssen/refactor

Enable C99, enable more warnings and solve some warnings.

8 years agoadd missing layers support in -Tsvgz device untagged-1d58b621a7287e0b0a25
John Ellson [Fri, 22 Jul 2016 14:47:02 +0000 (10:47 -0400)]
add missing layers support in -Tsvgz device

8 years agoFixed Wundef warnings in various files in sfio.
Erwin Janssen [Tue, 12 Jul 2016 13:21:43 +0000 (15:21 +0200)]
Fixed Wundef warnings in various files in sfio.

The fixed header files are included in multiple locations, causing a reducution of around 2000 Wundef warnings after these changes.

8 years agoFixed various Wundef warnings.
Erwin Janssen [Mon, 11 Jul 2016 22:45:09 +0000 (00:45 +0200)]
Fixed various Wundef warnings.

8 years agoSurrounded _BLD_cdt with defined() in cdt.h.
Erwin Janssen [Mon, 11 Jul 2016 20:27:33 +0000 (22:27 +0200)]
Surrounded _BLD_cdt with defined() in cdt.h.

This solves hundreds of Wundef warnings.

8 years agoSurrounded _PACKAGE_ast with defined() where needed.
Erwin Janssen [Mon, 11 Jul 2016 19:14:18 +0000 (21:14 +0200)]
Surrounded _PACKAGE_ast with defined() where needed.

This solves more than a thousend Wundef warnings.

8 years agoFixed Wundef warnings in ast_common.h.in
Erwin Janssen [Mon, 11 Jul 2016 18:38:39 +0000 (20:38 +0200)]
Fixed Wundef warnings in ast_common.h.in

There were several Wundef warnings in ast_common.h.in. Because this file is included in a lot of other files, these warnings showed up often. This change fixed 1119 warnings in total.

8 years agoSet std=c99 and multiple warnings for GCC
Erwin Janssen [Mon, 11 Jul 2016 16:28:36 +0000 (18:28 +0200)]
Set std=c99 and multiple warnings for GCC

Using std=c99 enables some convenient features in the C language.
More compiler warnings offer a chance to improve the code quality.

8 years agoMerge branch 'master' of github.com:/ellson/graphviz untagged-1843dff5ba962a1be63b untagged-3324163453e4161833a0
John Ellson [Thu, 21 Jul 2016 21:01:01 +0000 (17:01 -0400)]
Merge branch 'master' of github.com:/ellson/graphviz

8 years agoMerge pull request #1142 from ikrabbe/figdriver
John Ellson [Thu, 21 Jul 2016 21:00:04 +0000 (17:00 -0400)]
Merge pull request #1142 from ikrabbe/figdriver

Figdriver

8 years agoMerge pull request #1141 from ikrabbe/master
John Ellson [Thu, 21 Jul 2016 20:58:30 +0000 (16:58 -0400)]
Merge pull request #1141 from ikrabbe/master

quickfix for metapost

8 years agofix broken ref to GD_LIBS that broke static builds
John Ellson [Thu, 21 Jul 2016 18:33:11 +0000 (14:33 -0400)]
fix broken ref to GD_LIBS that broke static builds

8 years agoapproximate height and move the text point by a constant
Ingo Krabbe [Tue, 19 Jul 2016 13:28:36 +0000 (15:28 +0200)]
approximate height and move the text point by a constant

8 years agoquickfix for metapost
Ingo Krabbe [Tue, 19 Jul 2016 07:13:48 +0000 (09:13 +0200)]
quickfix for metapost

8 years agoMerge pull request #1137 from ErwinJanssen/replace-libgd untagged-dca5f3fa2a3476aaf8e3
John Ellson [Thu, 14 Jul 2016 14:16:48 +0000 (10:16 -0400)]
Merge pull request #1137 from ErwinJanssen/replace-libgd

Replace in-tree libgd with external build of recent code

8 years agoDelete references to old lib/gd location.
Erwin Janssen [Wed, 13 Jul 2016 15:55:38 +0000 (17:55 +0200)]
Delete references to old lib/gd location.

Deleted:
- Every reference pointing to lib/gd in the .vcxproj files.
- Entry in .gitignore pointing to file in lib/gd.

8 years agoUpdated graphviz-build-utilities submodule.
Erwin Janssen [Tue, 12 Jul 2016 23:07:44 +0000 (01:07 +0200)]
Updated graphviz-build-utilities submodule.

8 years agoAppveyor: Hard path to build utilities.
Erwin Janssen [Tue, 12 Jul 2016 22:30:36 +0000 (00:30 +0200)]
Appveyor: Hard path to build utilities.

Using %APPVEYOR_BUILD_FOLDER% doesn't work, so using a hard coded path
instead.

8 years agoAppveyor: Added empty lines as seperation
Erwin Janssen [Tue, 12 Jul 2016 22:23:45 +0000 (00:23 +0200)]
Appveyor: Added empty lines as seperation

Commands must be seperated by an empty line or they are executed like one
command.

8 years agoChanged Bison, Flex and SED source.
Erwin Janssen [Tue, 12 Jul 2016 22:11:10 +0000 (00:11 +0200)]
Changed Bison, Flex and SED source.

These utilities were installed from sourceforge, but this website has been
unstable lately. Often builds failed because the site was unreachable. The
utilities are now included using a git submodule.

8 years agoAppveyor: automated build of libgd dependency
Erwin Janssen [Tue, 12 Jul 2016 21:25:17 +0000 (23:25 +0200)]
Appveyor: automated build of libgd dependency

Download and install the libgd dependencies. Use nmake to compile.

8 years agoDeleted two `extern` in gvrender_gd.c
Erwin Janssen [Tue, 12 Jul 2016 21:10:47 +0000 (23:10 +0200)]
Deleted two `extern` in gvrender_gd.c

These two `extern` defintions were causing linker errors.

8 years agoChanged references to libgd to new location.
Erwin Janssen [Tue, 12 Jul 2016 21:08:08 +0000 (23:08 +0200)]
Changed references to libgd to new location.

References pointing to the old lib/gd location now point to the new
windows/dependencies/libgd.

8 years agoDeleted lib/gd
Erwin Janssen [Tue, 12 Jul 2016 21:01:03 +0000 (23:01 +0200)]
Deleted lib/gd

- Deleted the the folder and all the files.
- Removed the project from the Visual Studio build
- libgd wasn't part of the autotools build, so nothing changed there.

8 years agoAdded source of libgd as submodule.
Erwin Janssen [Tue, 12 Jul 2016 14:18:25 +0000 (16:18 +0200)]
Added source of libgd as submodule.

Libgd is actively maintained, but there are no recompiled files for
Windows, so I include the source as a submodule.

8 years agoMerge branch 'master' of github.com:ellson/graphviz untagged-720ca8034db44a953d87
John Ellson [Sun, 10 Jul 2016 17:29:07 +0000 (13:29 -0400)]
Merge branch 'master' of github.com:ellson/graphviz

8 years ago--exclude=w[Cindows/dependencies/*/* not our code, and breaks ubuntus tar v7 as...
John Ellson [Sun, 10 Jul 2016 17:28:42 +0000 (13:28 -0400)]
--exclude=w[Cindows/dependencies/*/*   not our code, and breaks ubuntus tar v7 as used by traviz

8 years agono need to remove CVS dirs in dist-hook:
John Ellson [Sun, 10 Jul 2016 17:11:54 +0000 (13:11 -0400)]
no need to remove CVS dirs in dist-hook:

8 years agoMerge pull request #1135 from ErwinJanssen/fix-windows-build untagged-3c169aaa6280ec506b08
John Ellson [Sun, 10 Jul 2016 16:12:16 +0000 (12:12 -0400)]
Merge pull request #1135 from ErwinJanssen/fix-windows-build

Fix windows build

8 years agoDeleted `defined()` in ast_common.h around set values.
Erwin Janssen [Sun, 10 Jul 2016 00:59:05 +0000 (02:59 +0200)]
Deleted `defined()` in ast_common.h around set values.

Some values are defined 0 or 1 at the top of the file. There shouldn't be
a `defined` around these, as the value must the checked, not if they are
defined.

8 years agoDisabled mp_types on Windows as it causes errors.
Erwin Janssen [Sat, 9 Jul 2016 22:58:43 +0000 (00:58 +0200)]
Disabled mp_types on Windows as it causes errors.

8 years agoWindows: fix error when parallel building with VS.
Erwin Janssen [Sat, 9 Jul 2016 20:09:30 +0000 (22:09 +0200)]
Windows: fix error when parallel building with VS.

Gave the projects remaining projects in cmd/tools their own intermediate
directory (some already had this). This prevents errors when enabling
parallel build on Visual Studio.

8 years ago add 'make dist' to travis builds untagged-7f41f60ca2025e3251ad
John Ellson [Sun, 10 Jul 2016 11:56:58 +0000 (07:56 -0400)]
 add 'make dist' to travis builds

8 years agoMerge pull request #2 from ellson/master
Steve (Gadget) Barnes [Sun, 10 Jul 2016 10:31:37 +0000 (11:31 +0100)]
Merge pull request #2 from ellson/master

Sync from Master

8 years agofix diffimg test code untagged-64c3562a21c18efca077
John Ellson [Sun, 10 Jul 2016 10:28:01 +0000 (06:28 -0400)]
fix diffimg test code

8 years agoMerge pull request #1134 from GadgetSteve/master untagged-3e86d2bf29bb52eaf3f6
John Ellson [Sun, 10 Jul 2016 09:07:24 +0000 (05:07 -0400)]
Merge pull request #1134 from GadgetSteve/master

Address #95 by using f suffix on floats in color_palette.c

8 years agoFix for litteral warnings in color_palette.c to address #95 - continued.
Steve Barnes [Sun, 10 Jul 2016 07:08:14 +0000 (08:08 +0100)]
Fix for litteral warnings in color_palette.c to address #95 - continued.

8 years agoFix for litteral warnings in color_palette.c to address #95
Steve Barnes [Sun, 10 Jul 2016 06:04:53 +0000 (07:04 +0100)]
Fix for litteral warnings in color_palette.c to address #95

8 years agoremove rxpencer (unused, unneeded) untagged-02d82c4c9d0263e3d595
John Ellson [Sun, 10 Jul 2016 02:04:09 +0000 (22:04 -0400)]
remove rxpencer (unused, unneeded)

8 years agocomment out empty "file:" statement untagged-fd4ca25a4ca4e4dc471c
John Ellson [Sun, 10 Jul 2016 01:39:41 +0000 (21:39 -0400)]
comment out empty "file:" statement

8 years agoattempting to set up travis
John Ellson [Sun, 10 Jul 2016 01:20:44 +0000 (21:20 -0400)]
attempting to set up travis

8 years agofix break to 'make dist'
John Ellson [Sat, 9 Jul 2016 14:31:23 +0000 (10:31 -0400)]
fix break to 'make dist'

8 years agodon't know why we need this anymore - but softling to the identical .gitignore
John Ellson [Sat, 9 Jul 2016 14:30:46 +0000 (10:30 -0400)]
don't know why we need this anymore - but softling to the identical .gitignore

8 years agoMerge pull request #96 from ErwinJanssen/windows-build
John Ellson [Sat, 9 Jul 2016 13:48:08 +0000 (09:48 -0400)]
Merge pull request #96 from ErwinJanssen/windows-build

Windows build

8 years agofix mp pluging loading
John Ellson [Sat, 9 Jul 2016 13:32:16 +0000 (09:32 -0400)]
fix mp pluging loading

8 years agoMerge pull request #1133 from ikrabbe/master
John Ellson [Sat, 9 Jul 2016 13:18:04 +0000 (09:18 -0400)]
Merge pull request #1133 from ikrabbe/master

fixed metapost core plugin to compile

8 years agofixed metapost core plugin to compile
Ingo Krabbe [Sat, 9 Jul 2016 08:47:45 +0000 (10:47 +0200)]
fixed metapost core plugin to compile

8 years agoMerge pull request #1 from ellson/master
Steve (Gadget) Barnes [Sat, 9 Jul 2016 08:18:31 +0000 (09:18 +0100)]
Merge pull request #1 from ellson/master

Merge from ellison/graphviz

8 years agoretry disable PHP7
John Ellson [Fri, 8 Jul 2016 16:38:42 +0000 (12:38 -0400)]
retry disable PHP7

8 years agoretry disable PHP7
John Ellson [Fri, 8 Jul 2016 16:28:56 +0000 (12:28 -0400)]
retry disable PHP7

8 years agodisable PHP7 support in fc25 until swig supports it
John Ellson [Fri, 8 Jul 2016 15:48:57 +0000 (11:48 -0400)]
disable PHP7 support in fc25 until swig supports it

8 years agoSync branch with upstream master to resolve conflicts.
Erwin Janssen [Fri, 8 Jul 2016 15:44:13 +0000 (17:44 +0200)]
Sync branch with upstream master to resolve conflicts.

Merge master into windows-build branch to resolvle conflicts in ingore
files.

8 years agoclean automated rules from .gitignore, fix lib/cdt/*cvxproj*
John Ellson [Wed, 6 Jul 2016 19:51:19 +0000 (15:51 -0400)]
clean automated rules from .gitignore, fix lib/cdt/*cvxproj*

8 years agoMerge pull request #158 from ErwinJanssen/gitignore
John Ellson [Wed, 6 Jul 2016 19:32:29 +0000 (15:32 -0400)]
Merge pull request #158 from ErwinJanssen/gitignore

Refactor ignore files (gitignore and hgignore)

8 years agoMerge pull request #98 from GadgetSteve/master
John Ellson [Wed, 6 Jul 2016 19:31:09 +0000 (15:31 -0400)]
Merge pull request #98 from GadgetSteve/master

Changed README.md tracker to reference github. Addresses #97

8 years agoAdded regression test resut folders to ignore files.
Erwin Janssen [Mon, 4 Jul 2016 15:43:36 +0000 (17:43 +0200)]
Added regression test resut folders to ignore files.

8 years agoGrouped all files generated during make in ignore file.
Erwin Janssen [Mon, 4 Jul 2016 15:05:57 +0000 (17:05 +0200)]
Grouped all files generated during make in ignore file.