[rkward-cvs] [rkward] packages/rkwarddev: Merge branch 'master' of git.kde.org:rkward

[m.eik m. <mei...@un...>]

Git commit 2a7c45b02699db86ef9b0a536249223c2ea99270 by m.eik michalke.
Committed on 06/01/2015 at 20:39.
Pushed by meikm into branch 'master'.

Merge branch 'master' of git.kde.org:rkward

Conflicts:
	packages/rkwarddev/ChangeLog

M  +3    -1    packages/rkwarddev/ChangeLog

http://commits.kde.org/rkward/2a7c45b02699db86ef9b0a536249223c2ea99270

diff --cc packages/rkwarddev/ChangeLog
index b0a91ff,0822bf7..ad5cbc2
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@@ -62,9 -62,8 +62,11 @@@ changed
    - rk.JS.doc() now uses a more robust method to set global variables, namely
      by defining an additional function setGlobalVars() and calling that
      inside preprocess()
 +  - due to changes needed for i18n and rk.JS.header() to work, check your
 +    "result.header" values, there might be quote issues. for the most part,
 +    remove quotes you added for rkwarddev >= 0.05-0
+   - updated the generation of author and maintainer fileds in DESCRIPTIONs
+     made by rk.plugin.skeleton(), borrowing get.authors() from roxyPackage
  removed:
    - the functions rk.set.language() rk.get.language() were no longer useful
      and therefore removed