« back to all changes in this revision
Viewing changes to .bzrignore
- Committer: David Coles
- Date: 2010-07-28 10:45:53 UTC
- mfrom: (1829 trunk)
- mto: This revision was merged to the branch mainline in revision 1830.
- Revision ID: coles.david@gmail.com-20100728104553-5z3nxt0l6kyfqfh5
Merge from trunk
- files added:
- .bzrignore
- bin
- bin/timount
- bin/trampoline
- doc/dev
- doc/images
- doc/man
- doc/static
- doc/templates
- examples
- examples/config
- examples/db
- examples/userrepos
- exercises
- exercises/sample
- image-source
- ivle
- ivle/auth
- ivle/conf
- ivle/conf/app
- ivle/config
- ivle/dispatch
- ivle/fileservice_lib
- ivle/jailbuilder
- ivle/pulldown_subj
- ivle/rpc
- ivle/tests
- ivle/webapp
- ivle/webapp/admin
- ivle/webapp/admin/subject-media
- ivle/webapp/admin/templates
- ivle/webapp/admin/user-media
- ivle/webapp/base
- ivle/webapp/base/test
- ivle/webapp/console
- ivle/webapp/console/media
- ivle/webapp/coremedia
- ivle/webapp/coremedia/images
- ivle/webapp/coremedia/images/apps/small
- ivle/webapp/coremedia/images/chrome
- ivle/webapp/fileservice
- ivle/webapp/filesystem
- ivle/webapp/filesystem/diff
- ivle/webapp/filesystem/diff/media
- ivle/webapp/filesystem/svnlog
- ivle/webapp/filesystem/svnlog/media
- ivle/webapp/forum
- ivle/webapp/forum/media
- ivle/webapp/groups
- ivle/webapp/groups/media
- ivle/webapp/help
- ivle/webapp/help/media
- ivle/webapp/publisher
- ivle/webapp/security
- ivle/webapp/submit
- ivle/webapp/testing
- ivle/webapp/tos
- ivle/webapp/tos/media
- ivle/webapp/tutorial/media
- ivle/webapp/tutorial/media/images
- ivle/webapp/tutorial/media/images/tiny
- ivle/webapp/tutorial/templates
- ivle/webapp/tutorial/test
- ivle/webapp/userservice
- ivle/worksheet
- services
- setup
- subjects
- subjects/sample
- test
- test/misc
- test/test_framework
- userdb/migrations
- files removed:
- LICENSE.txt
- console
- doc/notes
- doc/notes/apps
- platform
- platform/config
- platform/scripts
- prototypes
- prototypes/browser
- prototypes/browser/browser-interface
- prototypes/browser/browser-interface/images
- prototypes/browser/browser-interface/images/interface
- prototypes/browser/browser-interface/images/mime
- prototypes/browser/browser-interface/images/mime/large
- prototypes/browser/browser-interface/images/svn
- trampoline
- www
- www/apps
- www/apps/console
- www/apps/debuginfo
- www/apps/download
- www/apps/dummy
- www/apps/editor
- www/apps/fileservice
- www/apps/help
- www/auth
- www/common
- www/conf
- www/conf/app
- www/dispatch
- www/media
- www/media/common
- www/media/images
- files renamed:
- www/apps/console/help.html => ivle/webapp/console/help.html
- www/media/images/apps/console.png => ivle/webapp/console/media/console.png
- www/media/images/README => ivle/webapp/coremedia/images/README
- www/media/images/apps/ => ivle/webapp/coremedia/images/apps/
- www/media/images/interface/ => ivle/webapp/coremedia/images/interface/
- www/media/images/mime/ => ivle/webapp/coremedia/images/mime/
- www/media/images/svn/ => ivle/webapp/coremedia/images/svn/
- www/media/common/ivle.css => ivle/webapp/coremedia/ivle.css
- www/media/common/json2.js => ivle/webapp/coremedia/json2.js
- www/media/common/util.js => ivle/webapp/coremedia/util.js
- www/apps/browser/ => ivle/webapp/filesystem/browser/
- www/media/browser/ => ivle/webapp/filesystem/browser/media/
- www/apps/server/ => ivle/webapp/filesystem/serve/
- www/media/images/apps/help.png => ivle/webapp/help/media/help.png
- www/apps/tutorial/ => ivle/webapp/tutorial/
- www/media/images/apps/tutorial.png => ivle/webapp/tutorial/media/tutorial.png
- files modified:
- ivle/webapp/coremedia/images/mime/dir.png
added
removed
.bzrignore
