[acpi/f20: 3/4] Merge branch 'master' into f20

opuk opuk at fedoraproject.org
Wed Dec 11 19:59:27 UTC 2013


commit 6409ee677d209c289814dd7b9c7c685dc6444b99
Merge: 1e5f840 b5ac783
Author: Johan Swensson <kupo at kupo.se>
Date:   Wed Dec 11 20:51:53 2013 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	acpi.spec

 .gitignore |    1 +
 acpi.spec  |    8 ++++++--
 sources    |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc acpi.spec
index 5fcaada,467560f..2679cc2
--- a/acpi.spec
+++ b/acpi.spec
@@@ -34,6 -34,9 +34,10 @@@ make install DESTDIR=$RPM_BUILD_ROO
  %{_mandir}/man1/acpi.1*
  
  %changelog
++=======
+ * Sun Dec 01 2013 Johan Swensson <kupo at kupo.se> - 1.7-1
+ - New upstream release 1.7
+ 
  * Wed Oct 30 2013 Johan Swensson <kupo at kupo.se> - 1.6-3
  - Fixed changelog
  


More information about the scm-commits mailing list