[depqbf] 02/04: Merge branch 'master' into devel

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository depqbf.

commit eeed410897adfc319cb7e5191090ff86b93db136
Merge: 3fdf39e bd446c2
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue Dec 22 08:29:52 2015 +0100

    Merge branch 'master' into devel

 {DepQBF4J-0.1 => DepQBF4J-0.2}/COPYING             |     0
 {DepQBF4J-0.1 => DepQBF4J-0.2}/ChangeLog           |     3 +
 {DepQBF4J-0.1 => DepQBF4J-0.2}/README              |     7 +-
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/DepQBF4J.c      |    60 +-
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/Makefile        |     0
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/COPYING  |     0
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/NEWS     |    21 +
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/README   |   190 +-
 .../jni/depqbf/examples/basic-api-example.c        |     0
 .../jni/depqbf/examples/basic-api-example2.c       |     0
 .../jni/depqbf/examples/basic-api-example3.c       |     0
 .../basic-clause-groups-api-example-assumptions.c  |   173 +
 .../examples/basic-clause-groups-api-example.c     |   168 +
 .../jni/depqbf/examples/basic-manual-selectors.c   |     0
 .../jni/depqbf/examples/makefile                   |     3 +
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/makefile |    18 +-
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/qdpll.c  | 11845 +++++++++++++------
 {DepQBF4J-0.1 => DepQBF4J-0.2}/jni/depqbf/qdpll.h  |   157 +-
 .../jni/depqbf/qdpll_app.c                         |    35 +-
 .../jni/depqbf/qdpll_config.h                      |    14 +-
 .../jni/depqbf/qdpll_dep_man_generic.h             |     4 +-
 .../jni/depqbf/qdpll_dep_man_qdag.c                |   211 +-
 .../jni/depqbf/qdpll_dep_man_qdag.h                |     4 +-
 .../jni/depqbf/qdpll_dep_man_qdag_types.h          |     4 +-
 .../jni/depqbf/qdpll_exit.h                        |     4 +-
 .../jni/depqbf/qdpll_internals.h                   |   197 +-
 .../jni/depqbf/qdpll_main.c                        |     4 +-
 .../jni/depqbf/qdpll_mem.c                         |     4 +-
 .../jni/depqbf/qdpll_mem.h                         |     4 +-
 .../jni/depqbf/qdpll_pcnf.h                        |   126 +-
 DepQBF4J-0.2/jni/depqbf/qdpll_pqueue.c             |   370 +
 DepQBF4J-0.2/jni/depqbf/qdpll_pqueue.h             |    66 +
 .../jni/depqbf/qdpll_stack.h                       |     4 +-
 .../src/depqbf4j/DepQBF4J.java                     |    76 +-
 .../src/depqbf4j/Example_basic_api_example.java    |     0
 .../src/depqbf4j/Example_basic_api_example2.java   |    26 +-
 .../src/depqbf4j/Example_basic_api_example3.java   |    20 +-
 .../Example_basic_clause_groups_api_example.java   |   176 +
 .../depqbf4j/Example_basic_manual_selectors.java   |     0
 .../src/depqbf4j/Makefile                          |     7 +-
 NEWS                                               |    21 +
 README                                             |   190 +-
 examples/basic-api-example.c                       |     4 +-
 examples/basic-api-example3.c                      |     4 +-
 .../basic-clause-groups-api-example-assumptions.c  |   173 +
 examples/basic-clause-groups-api-example.c         |   168 +
 examples/makefile                                  |     3 +
 makefile                                           |    18 +-
 qdpll.c                                            | 11845 +++++++++++++------
 qdpll.h                                            |   157 +-
 qdpll_app.c                                        |    35 +-
 qdpll_config.h                                     |    14 +-
 qdpll_dep_man_generic.h                            |     4 +-
 qdpll_dep_man_qdag.c                               |   211 +-
 qdpll_dep_man_qdag.h                               |     4 +-
 qdpll_dep_man_qdag_types.h                         |     4 +-
 qdpll_exit.h                                       |     4 +-
 qdpll_internals.h                                  |   197 +-
 qdpll_main.c                                       |     4 +-
 qdpll_mem.c                                        |     4 +-
 qdpll_mem.h                                        |     4 +-
 qdpll_pcnf.h                                       |   126 +-
 qdpll_pqueue.c                                     |   370 +
 qdpll_pqueue.h                                     |    66 +
 qdpll_stack.h                                      |     4 +-
 65 files changed, 19727 insertions(+), 7908 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/depqbf.git