Author: iocanel
Date: Sat Aug 27 10:42:00 2011
New Revision: 1162322
URL: http://svn.apache.org/viewvc?rev=1162322&view=rev
Log:
Merged from trunk
[KARAF-823] Added NOTICE file. [from revision 1162321]
Added:
karaf/cellar/branches/cellar-2.2.x/dosgi/NOTICE
- copied unchanged from r1162321, karaf/cellar/trunk/dosgi/NOTICE
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 10:42:00 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321
