forked from jonas-koeritz/Taktische-Zeichen
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into newVehicles
* upstream/master: (61 commits) Neue Maßnahme, References jonas-koeritz#16 Fernmeldesymbole aus jonas-koeritz#97 eingearbeitet. Flugleiter THW und Allgemein hinzugefügt Neues Zeichen: Flugleiter Redundanten Text entfernt Neues Zeichen: UAV Erkundungsgruppe Formulierung Formulierung Lizenz verdeutlicht, fixes jonas-koeritz#102 Hinweis zur Einbindung in QGIS dominant-baseline entfernt. Verbessert die Kompatibilität mit QGIS viewbox hinzugefügt, references jonas-koeritz#108 Viewbox hinzugefügt. References jonas-koeritz#108 Rename AWINAP.j2 to AWITEL-.j2 Rename AWINAP-Telefon.j2 to AWITEL-Telefon.j2 Rename AWINAP-OB.j2 to AWITEL-OB.j2 Rename AWINAP-Funkbrücke.j2 to AWITEL-Funkbrücke.j2 Rename AWINAP-Funkbrücke-4m.j2 to AWITEL-Funkbrücke-4m.j2 Rename AWINAP-Funkbrücke-2m.j2 to AWITEL-Funkbrücke-2m.j2 Rename AWINAP-AWINAP.j2 to AWITEL-AWITEL.j2 ... # Conflicts: # symbols/Feuerwehr_Fahrzeuge/ELW_1.j2 # symbols/Feuerwehr_Fahrzeuge/ELW_2.j2 # symbols/Feuerwehr_Fahrzeuge/Gerätewagen_Atemschutz.j2 # symbols/Feuerwehr_Fahrzeuge/Gerätewagen_Gefahrgut.j2 # symbols/Feuerwehr_Fahrzeuge/Gerätewagen_Logistik.j2 # symbols/Feuerwehr_Fahrzeuge/Gerätewagen_Logistik_1.j2 # symbols/Feuerwehr_Fahrzeuge/Gerätewagen_Logistik_2.j2 # symbols/Feuerwehr_Fahrzeuge/HLF.j2 # symbols/Feuerwehr_Fahrzeuge/LF_16-TS.j2 # symbols/Feuerwehr_Fahrzeuge/LF_24-50.j2 # symbols/Feuerwehr_Fahrzeuge/LF_8-6.j2 # symbols/Feuerwehr_Fahrzeuge/LF_KatS.j2 # symbols/Feuerwehr_Fahrzeuge/Messfahrzeug.j2 # symbols/Feuerwehr_Fahrzeuge/Reaktorerkundungskraftwagen.j2 # symbols/Feuerwehr_Fahrzeuge/TLF_16-25.j2 # symbols/Feuerwehr_Fahrzeuge/TLF_2000.j2 # symbols/Feuerwehr_Fahrzeuge/TLF_3000.j2 # symbols/Feuerwehr_Fahrzeuge/TLF_4000.j2 # symbols/Feuerwehr_Fahrzeuge/Tanklöschfahrzeug.j2 # symbols/Kommunal_Fahrzeuge/MTW.j2 # symbols/Rettungswesen_Fahrzeuge/Gerätewagen_Sanität.j2 # symbols/Rettungswesen_Fahrzeuge/KTW.j2 # symbols/Rettungswesen_Fahrzeuge/Notarzteinsatzfahrzeug.j2 # symbols/Rettungswesen_Fahrzeuge/Notarztwagen.j2 # symbols/Rettungswesen_Fahrzeuge/RTW.j2 # symbols/THW_Fahrzeuge/Bergungsräumgerät.j2 # symbols/THW_Fahrzeuge/ERS.j2 # symbols/THW_Fahrzeuge/FmKW.j2 # symbols/THW_Fahrzeuge/FüKomKW.j2 # symbols/THW_Fahrzeuge/Führungskraftwagen.j2 # symbols/THW_Fahrzeuge/GKW_7t.j2 # symbols/THW_Fahrzeuge/GKW_I.j2 # symbols/THW_Fahrzeuge/GKW_II.j2 # symbols/THW_Fahrzeuge/Geländestapler.j2 # symbols/THW_Fahrzeuge/Kipper.j2 # symbols/THW_Fahrzeuge/LKW-Ladekran.j2 # symbols/THW_Fahrzeuge/LKW.j2 # symbols/THW_Fahrzeuge/LKW_K_9t.j2 # symbols/THW_Fahrzeuge/LKW_K_Lkr.j2 # symbols/THW_Fahrzeuge/LKW_K_Lkr_1_5t.j2 # symbols/THW_Fahrzeuge/LKW_Lbw.j2 # symbols/THW_Fahrzeuge/LKW_Lbw_7t.j2 # symbols/THW_Fahrzeuge/MLW_I.j2 # symbols/THW_Fahrzeuge/MLW_II.j2 # symbols/THW_Fahrzeuge/MLW_III.j2 # symbols/THW_Fahrzeuge/MLW_IV.j2 # symbols/THW_Fahrzeuge/MLW_V.j2 # symbols/THW_Fahrzeuge/MTW.j2 # symbols/THW_Fahrzeuge/MzGW.j2 # symbols/THW_Fahrzeuge/MzKW.j2 # symbols/THW_Fahrzeuge/PKW_Geländegängig.j2 # symbols/THW_Fahrzeuge/PKW_Weitverkehrstrupp.j2 # symbols/THW_Fahrzeuge/Personenkraftwagen.j2 # symbols/THW_Fahrzeuge/Radbagger.j2 # symbols/THW_Fahrzeuge/Radlader.j2 # symbols/THW_Fahrzeuge/Stapler.j2 # symbols/THW_Fahrzeuge/Stapler_2t.j2 # symbols/THW_Fahrzeuge/Stapler_3t.j2 # symbols/THW_Fahrzeuge/THV.j2 # symbols/THW_Fahrzeuge/Telelader.j2
- Loading branch information
Showing
670 changed files
with
2,128 additions
and
1,166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
symbols/Einrichtungen/Halteplatz_für_Fahrzeuge_zum_Verletztentransport.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.