Merge branch 'develop'

Author: andersbryrup

os2web_adlib_api.info

@@ -3,54 +3,6 @@ description = Implements calls to allow access to the AdLib webservice
 
 package = OS2Web - Backend
 core = 7.x
-
-; Additional infomation
-version = "7.x-0.1"
-;Added by OS2Web 2012-09-04
-project=OS2Web
-version=1.1
-timestamp=1346750231
-
-;Added by OS2Web 2012-09-04
-project=OS2Web
-version=7.x-1.1
-timestamp=1346751781
-
-;Added by OS2Web 2012-09-12
-project=OS2Web
-version=7.x-1.2
-timestamp=1347452763
-
-;Added by OS2Web 2012-10-09
-project=OS2Web
-version=7.x-1.3
-timestamp=1349771943
-
-;Added by OS2Web 2012-10-15
-project=OS2Web
-version=7.x-1.5
-timestamp=1350300162
-
-;Added by OS2Web 2012-10-23
-project=OS2Web
-version=7.x-1.6
-timestamp=1350990827
-
-
-;Added by OS2Web 2012-11-05
-project=OS2Web
-version=7.x-1.7
-timestamp=1352123374
-
-
-;Added by OS2Web 2012-11-13
-project=OS2Web
-version=7.x-1.8
-timestamp=1352802164
-
-
-;Added by OS2Web 2012-11-19
-project=OS2Web
-version=7.x-1.10
-timestamp=1353326099
-
+version=7.x-1.0-beta1
+dependencies[] = features
+features[features_api][] = api:1

os2web_adlib_api.make

@@ -17,3 +17,6 @@ core = 7.x
 
 
 ; Basic
+
+projects[features][subdir] = "contrib"
+projects[features][version] = "2.0-beta1"