Watch

Reviewing merge request #67: Cleanup of the websrc chaos

Implements #334

html pages, css files and images were mixed between the dss-websrc-mainline and dss-mainline repositories.

Cleaned up the mess, removed old unused stuff, especially of the submodules that were anyway no longer in use.

Replaced the "build and copy" script with an autotools based configuration/makefiles.

Requested by: Sergey Bostandzhyan
Status: Closed
Source repository: jins-dss-websrc-mainline:334-chaos-cleanup
Target repository: dss-websrc-mainline:master
Created at: August 5th, 2010 18:13

Commits that would be merged:

Version 2

Version 1
Version 2

417fd8e
b4e2e52

Major restructuring

a97355a

Removed copy script as it is no longer needed

cbdeafa

Added disk icon for "save" and made use of it

7b2ae65

Processed all UI sources using a js beautifier

Showing

Showing 417fd8e-b4e2e52

Comments
Include comments entered inline

→ State changed from Open to Closed

Looks good, merged

Johannes Winkelmann | 2010-08-06 13:09:56 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/67

# Fetch the merge request into this branch
git pull \
  git://gitorious.digitalstrom.org/dss-websrc/dss-websrc-mainline.git \
  refs/merge-requests/67

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/67

# To apply the changes to your branch:
git checkout master
git merge merge-requests/67
git push origin master

Reviewing merge request #67: Cleanup of the websrc chaos

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline