-
Conflicts: 400-SOURCECODE/AIAHTML5.Web/Web.config 400-SOURCECODE/AIAHTML5.Web/index.html
-
Conflicts: 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj 400-SOURCECODE/AIAHTML5.Web/Web.config 400-SOURCECODE/AIAHTML5.Web/index.html
-
Conflicts: 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
-
Setting is integrated
-
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html # 400-SOURCECODE/AIAHTML5.Web/content/data/json/da/da_dat_orient_image.json
-
Merged code of navigator man with draggable issue
-
1. Added close button. 2. issue is fixed.
-
… different so it is not working.
-
implemented zoom for 25 and 75 level but on 25th zoom level annotations are showing on wrong place.