]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
projects / packages / rpm-build-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 397fa86 5759a45)
Merge branch 'PLD'
authorKacper Kornet <draenog@pld-linux.org>
Mon, 2 Apr 2012 13:48:19 +0000 (14:48 +0100)
committerKacper Kornet <draenog@pld-linux.org>
Mon, 2 Apr 2012 13:48:19 +0000 (14:48 +0100)
Conflicts:
builder.sh

1  2 
adapter.sh patch | diff1 | diff2 | blob | history
builder.sh patch | diff1 | diff2 | blob | history

diff --cc adapter.sh
index ecf0f77dc4e3fac8be7d22cea60394ea1a87a398,44a4ee28f296a0d8370e89fb25bfe37bcf273ba4..44a4ee28f296a0d8370e89fb25bfe37bcf273ba4
mode 100755,100644..100755
--- 1/adapter.sh
--- 2/adapter.sh
+++ b/adapter.sh
diff --cc builder.sh
index 70707727d22632e530756b99ac5aa4f8f306a41e,6600290f804be2efbc75d4d0283b10de4dbf59ed..39568ed678168898551e2447f77a489ae1decd03
mode 100755,100644..100755
--- 1/builder.sh
--- 2/builder.sh
+++ b/builder.sh
Scripts for managing .spec files and building RPM packages
This page took 0.043588 seconds and 4 git commands to generate.