diff options
| author | Sven Gothel <[email protected]> | 2023-08-08 11:08:16 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-08-08 11:08:16 +0200 |
| commit | e33d67ee14f6a5b999564b40ac0c659db92f2ce0 (patch) | |
| tree | 2a314eb52ffc21f885e9bf42562234a9b93bdeea /README.md | |
| parent | 00f97cc623469377c59985898b9b765ae66c0aee (diff) | |
| parent | 5e50e75ec33f5b4567cabfd60b6baca39524a8b7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pulled
# Conflicts:
# build.gradle
# gradle.properties
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# gradlew
# gradlew.bat
# src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java
# src/main/java/com/jogamp/gluegen/jcpp/Preprocessor.java
# src/main/java/com/jogamp/gluegen/jcpp/SourceIterator.java
# src/main/java/org/anarres/cpp/Main.java
# src/test/java/com/jogamp/gluegen/jcpp/PragmaTest.java
# src/test/java/com/jogamp/gluegen/jcpp/RegressionTest.java
# src/test/java/com/jogamp/gluegen/jcpp/VaArgsPastingTest.java
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions