labofsahil/github-event-dataset-2012 huggingface dataset:
add chose boot grub device
hide macro char limit because it doesn't want to move since 5.0.4
output effective variance details
Refactored connector tests for sql to be more integrated, added update and destroy
Added where to connector, moved parse attrs to connector.  SQL connector complete
定数最適化用一時環境はstaticにせず、一々作ることにした

毎回作ることより開放されないことの方が気になる
optimizer用、基本ライブラリすら準備しない環境を構築出来る様に
それよりどちらかというと一時環境を全て共通のstatic objectにした
modif nouvelle version
ajout images admin
add Reset Password
Добавлен прогрев кеша в момент инициализации хранилища.
После прогрева запросы со сложными предикатами, с которых используются связи объекта, выполняеются также быстро, как и запросы к CoreData
Update sql.php

There is still a few bugs that I want to make sure are figured out.
Renamed plex-media-server-ww.plg to plex-media-server.plg
Gathering statistics for test runs
Displaying statistics
Bumping version number to 0.2
--interpreter flag works!
py3k word frequency count example
test_option_store
Moved more OptionStore test cases into test_option_store
Yet more test case portage
Comments about test locations
--interpreter docs
Default runner different across mrjob.launch and mrjob.job
Add "mrjob" script"
Remove dead code
Local runner does not need explicit interpreter if script is executable
bin/mrjob requires a command (currently only supports 'run')
Generalize default forwarding behavior
Merge branch 'interp_bin' of github.com:irskep/mrjob into interp_bin
Merge pull request #520 from irskep/interp_bin

--interpreter and bin/mrjob
use syntax highlighting in README.rst
Merge pull request #556 from eklitzke/master

Use syntax highlighting in README.rst
extractrecordを強化
並列的にレコード生成を試みる
Beginning support for collada files. basic Lights and lightType working
change null to blank, because if null, data should be inputed when profile change
new file:   SCTP_client.c
	new file:   client.c
	modified:   client_header/sessionIO.h
	modified:   client_header/tunnel.h
	new file:   server.c
	modified:   server_header/sessionIO.h
	modified:   server_header/tunnel.h
	deleted:    SCTP.tar
	deleted:    client_header/tunnel_client.h
	deleted:    server_header/tunnel_server.h
	deleted:    test
	deleted:    universal_header/cut_packet.h
	deleted:    universal_header/global_value.h
	deleted:    universal_header/sessionIO.h
	deleted:    SCTP.tar
	deleted:    client_header/tunnel_client.h
	deleted:    server_header/tunnel_server.h
	deleted:    test
	deleted:    universal_header/cut_packet.h
deleted:    universal_header/global_value.h
	deleted:    universal_header/sessionIO.h
Wrap include call in an anonymous function to avoid possible conflicts with variables
Working comments into addDecl
Site updated at 2012-11-05 23:43:53 UTC
listing contacts without sorting
Remove a channel when parted, and also make sure the channel requested exists before parting.
version 0.0.6 on market

includes insult randomiser
Exercise 4 importedi
exercise 04 template
Merge branch 'master' of git://github.com/apfohl/GPU
Hull Voxelization
Full Voxelization
Merge branch 'master' of git://github.com/apfohl/GPU
change tag to {alt}
добавлены загрузочные файлы клиента!!!! тест движения :D
faster package lookup
Handle all Metadata equally
Hint BEMHTML variable using jsdoc in html tech module
add documentation for book library tutorial
Project Reboot

Pausing work on advanced functionality to work on required functions in
a format for project 2.
Moved copies of work done for branch site-a to backup folder. Inserted
new index from JQM project, copied in new folders for css and JS. Added
old work to git-ignore list, but left it in the file structure for
reference locally.
issue #1 - simple parsing
Migrate API doc generation to use Docco-Husky
Added a license file
v1.0.1. Trivial changes.
added sky2000 support
	modified:   I239.py
	new file:   sky2000-text.description
	new file:   sky2000.py
Update js/aria2.js

Accept json rpc path from url hash string. (This can help user to remember their url and password in browser's bookmark)
hash check when setting init to overwrite it.
poprawki. test 14,15,16,17
test 11, 12, 13
save as bei leerem pfad
init
Merge branch 'master' of github.com:buffon/eva
More slavemonitor stuff
Refine zeusmaster/filemonitor boundary a bit
added IT-G 191112
add beta a1200 100b and 100c ports, plus untested 100a code from waterwingz in http://chdk.setepontos.com/index.php?topic=650.msg90317#msg90317
Add utils test
Improve update command.
Check diff
Improve update command
disable push for now
Fix
More info
describe update command.
(fix #47) Correctly calculate checksum for utf8 data.
2.3.13
Update so when the point chooser is opened
using 'Apply to Custom' it tunnels down to
the current selection.
Change cam_op() to camop()
Link error while linking camacrpc.c to mcnaf due to dummy function camop(). cam_op() should be renamed to camop() or inversely.
Add my CMake building files.
Fix CMakeLists.txt
Now, using add_custom_xxx to generate object targets
Add my CMake building files.
Update FindODBC.cmake
Update CMakeLists.txt

1. remove mh2sql due to linking error
2. using C++ to compile mhttpd.c
Try to fix some compiling problem
Revert CMakeLists
Update CMakeLists due to recently updated svn repos.
Update CMakeLists.txt for svn-r4616. Fix build error for lazylogger.c
Add genconf.sh
Update genconf.sh and generate new Makefile named Makefile.withconf
Add midas-config target to CMakeLists.txt
Add -lrt to OSFLAGS
Add my CMake building files.
Add genconf.sh
Tidy sources: file previleges, empty dirs, etc.
Import scripts from mdaq-midas
URL: https://github.com/cjpl/mdaq-midas
Chmod -x <files>
Borrow cmake mdoules
root: FindMySQL.cmake, FindODBC.cmake
geant4: FindROOT.cmake
add better cleanup, allow for creation without model object set at time of constructor
add new object types for enyo.CollectionList and associated controllers and properties, separate out logic of repeater rows used by enyo.CollectionRepeater as well
cleanup
fix bug with change notification and update to take advantage of enyo.Extension's move to component and dispatch events
update to reuse bindings, cleanup, intialization tweaks
修改：      app/controllers/application_controller.rb
	修改：      app/models/cart.rb
	修改：      app/models/product.rb
	修改：      app/views/carts/show.html.erb
	修改：      app/views/store/index.html.erb
	修改：      config/routes.rb
	修改：      db/schema.rb
	修改：      public/stylesheets/depot.css
	新文件：    app/assets/javascripts/line_items.js.coffee
	新文件：    app/assets/stylesheets/line_items.css.scss
	新文件：    app/controllers/line_items_controller.rb
	新文件：    app/helpers/line_items_helper.rb
	新文件：    app/models/line_item.rb
	新文件：    app/views/line_items/_form.html.erb
	新文件：    app/views/line_items/edit.html.erb
	新文件：    app/views/line_items/index.html.erb
	新文件：    app/views/line_items/new.html.erb
	新文件：    app/views/line_items/show.html.erb
	新文件：    db/migrate/20121105012247_create_line_items.rb
	新文件：    test/fixtures/line_items.yml
	新文件：    test/functional/line_items_controller_test.rb
	新文件：    test/unit/helpers/line_items_helper_test.rb
	新文件：    test/unit/line_item_test.rb
Get rid of frequency inversion.
Added container to donate
Merge branch 'master' of https://github.com/cxc222/yhc

Signed-off-by: cxc222 <cxc359170248@vip.qq.com>
Merge branch 'master' of https://github.com/cxc222/yhc
缺少图片

Signed-off-by: cxc222 <cxc359170248@vip.qq.com>
Updated scripts.js file
Added last five
Merge remote-tracking branch 'upstream/master'
format array for json output
Update EJBview/src/home/dgroup/actions/pages/animal/AnimalAction.java
incremental improvements serial
Changing coordinate system to be right handed.  Left handed (screen) coordinates
were messing with me mentally.

Added Python debugging.

Add pin tool.
/gachas
gacha#rotate実装
gacha単位でコインを消費するようにした
addし忘れ
r g controller coins index
coins#index
r g controller pieces index
pieces#index
薬草ピースの消費
authorized filter, specs, friendly forwarding
Added Array Global Variable and Array Argument
Entropy generator for sci.pub needs more time
Merge pull request #17 from dmi/fix-entropy-for-sci-pub

Entropy generator for sci.pub needs more time
New partitioning generator with build.sh

build.sh [-p PROFILE] -d DISKS -v -l [1|10|none]
  -p PROFILE  - default: SCI-amd64
  -d [DISKS|manual] - the number of disks for the system raid, starting from sda, default: 1
   Use "manual" for manual layout.
  -v - create /var partition (default are the root and swap partitions only)
  -l [LEVEL|none] - create RAID1/5/6/10 with lvm xenvg and xenvg/system-stuff
   LEVEL is the number, default: 1.
   If DISKS=1 then simple partition will be created instead of RAID.
   Use "none" if you wish to create LVM manually later - the "sci-setup xenvg"
   will offer you some options for this.
   NOTE: if DISKS=1 then -l will be always "none" to fix a problem with partman.
Merge pull request #18 from dmi/partman-variants

New partitioning generator with build.sh
modify NERDTreeWinPos to left
Mostrar erro 404 quando nome do site errado
Merge pull request #88 from leo-souza/master

mostrar erro 404 quando endereço errado
use index template
I do version specs good
fix mousewheel. use visible and 'last x points' to control the trails for each visible user. render better last-seen strings

Ignore-this: 88ea023020b7d0179233b454d061bb27

darcs-hash:20120501064737-312f9-4d7b3973c314190ad1ec9ecb138d1e13dd0c7560.gz
Removed c implementation.
Don't forget that we're using UTF-8 everywhere
Load Top N statistics via AJAX
Fixed language file installation
-
cond. qmake
+
++
.
enhanced gcc test
create XCode Project
removed the key argument to permit unboxing the keys
monoidal annotations, inlined, uncons, and view support
added view/uncons to Naive. {-# INLINE #-}
rename function
Add definitions file, create private fen functions
Added chessboard class
conditional definition of __fest_pushstr deleted
changelog updated
Merge pull request #13 from madimp/master

Удаление условного определения __fest_pushstr
escape attributes text value in compiler
fixed changelog
fix bug install
first steps to use bosh to communicate with jabber

gen_server similar to lxmppc_socket_tcp
for now only starts session
next step, remember session id and use it in next calls
finish bosh layer communication
improve body wraper
Merge pull request #1 from michalwski/bosh

Added bosh support
updated to version 0.079
JCR-1785: change product version
Update srv/resources/site-config/models/call.js

добавлено "bounded":true,
tighten things up a bit
remove exiting early
Show SVGs at 100% width.

Firefox would crop the content of the SVG, even if it fell inside of
the #result box.
implement postgres storage
Revert stray change made to simpleproxy in unrelated commit

Signed-off-by: Dan Farina <drfarina@acm.org>
Add toydog

This uses a map value to do routing rather than hitting a database
directly.  There is no sanctioned way to fill this map yet, but it can
be shown to work for demonstration and testing purposes.

Signed-off-by: Dan Farina <drfarina@acm.org>
Nav + bouton + et - dans budget
Eto.Platform.Windows.OpenGL assembly, IGL Widget implementation for Platform.Windows
Added constructor for restart flag
Mailbox: ajouté Size(), ajouté mutex sur l'ecriture. Mutex: corrigé déclaration
ui project structure
AdminRequired should return on redirect
Added the static primes for Team and Season tables
removed twofft stuff, not used anymore
fixed bug in gpu filterbank when input nchan != 1
added comments
moved nchan_subband from private to protected since it's used elsewhere
added comments
used nchan_subband instead of nchan to be more clear
updating comments, cleaning up code a bit
[Font] Removing Monaco font, seems like it's the only way to rename a file with Git. Stupid git.
We actually want Drupal in the docroot
add SK_WARN_UNUSED_RESULT warning to SkPathMeasure methods that might leave
POD var-arguments uninitialized.



git-svn-id: http://skia.googlecode.com/svn/trunk@3665 2bbb7eff-a529-9590-31e7-b0007b416f81
shape ops work in progress

git-svn-id: http://skia.googlecode.com/svn/trunk@4006 2bbb7eff-a529-9590-31e7-b0007b416f81
Added ReadPixels format-supported check to GL Caps

http://codereview.appspot.com/6336055/



git-svn-id: http://skia.googlecode.com/svn/trunk@4374 2bbb7eff-a529-9590-31e7-b0007b416f81
land https://codereview.appspot.com/6349043/



git-svn-id: http://skia.googlecode.com/svn/trunk@4375 2bbb7eff-a529-9590-31e7-b0007b416f81
OCCI ANTLR grammar: fixed wrong type name categories to kind for links
Merge remote-tracking branch 'origin/master'
Added element names for output
Update shell flow
update docs
Directory info provided
Inspecting of files works
Add forgotten resources script
Add output example
solve exectuable issue by making them all executable
resolve merge conflict
Add platform to package
Switch JS templating library to doT
Updates to cache

Few new methods to invalidate records on per user/all user basis, statistics...
auto upload Fri Dec 14 16:54:10 PST 2012
Create functional test for switching

There is now a test for switching the backend server, but it doesn't
pass yet.  The next step is to keep track of connections so that
the Pipe knows when a forwarding is no longer being used
Fix descriptions in Gemspec.
No need to cache cache lookups, readJson already does so
Update graceful-fs to 1.1.7
Show correct path in cache ls
Windows AV fs.rename hack moved to graceful-fs
git+xyz:// handling: + chars are ok in urls now.
update inherits LICENSE
fixes courier SMS layout bug.
Damn merge added garbage
Fix github button
Bugfix for issue #51
ry exec: default to all installed rubies when "all" is given
Merge pull request #17 from eregon/exec_default

ry exec: add an argument "all" to run with all installed rubies
rename selector to query and modularize
Fixed code generation of critcl::c++command.
The bug caused generation of C code violating the contract for Tcl_GetIndexFromObj(), calling it with a stack-allocated variable.
The fix changes this to a static variable, making the address constant, as it should be.
Package version bumped to 3.0.7.
Renamed RFM watchdog functions
Lista de ejercicios [Delivered #32875553]
fix bug: the last of erlmc_connections never used and failed when only one connection exists.

for example:
erlmc:start().
erlmc:get(<<"asinbow">>).
** exception error: bad argument
     in function  crypto:rand_uniform_pos/2 (crypto.erl, line 555)
     in call from erlmc:unique_connection/3 (src/erlmc.erl, line 357)
     in call from erlmc:get/2 (src/erlmc.erl, line 94)
Merge pull request #1 from asinbow/patch-1

fix bug: the last of erlmc_connections never used and failed when only o...
actor assignment in use case complete
Update GIT_VERSION to 1.7.4.4
UI Redesign and Date Toggle JS Fix
Renamed parseDefinition to parseDeclaration
Removed @inline, correction for attribute values.
Inlined version of isName and escaping no longer uses Utility.
VK comments widget size fixed
woops, forgot to set a value to NULL
Change span4s to span12
Make all tables vertically aligned.
Change unused form to a div.
Hide all intro-text and league select at start to avoid flashing.
fix indentation
testing i18n based on ResourceBundles ; fix u_printf conflict
add logo using webfont.
Chip updates based on work by m0vie
Tweaked app resource settings.
cmd arg for output file, runtest script for indexing
key_pressed
changed number of redirects ojo and the get command will follow to 10
Create classes to solve problem using a partial approximation to the Hessian

- no longer approximate the pJ'J term in new classes
- separate AugLag and SBMIN classes to handle this case
- debugging to follow ...
Fixed a couple of small errors in partial LBFGS implementation.

- now runs correctly and finds solution for a couple of HS problems
- early results show this method can reduce the number of SBMIN iterations
Merge branch 'lancelot-dev' into partial-approx
Minor fixes in BQP error handling and passing kwargs for AL frameworks
Merge branch 'partial-approx' into lancelot-dev
Sredjena if naredba na indexu, sredjeni svi thumbnail-ovi potrebni za sajt, dodati jos neki psd-ovi
-S command-line option (for example: ir -S irb)
Add spec for -S
Merge branch 'master' of git@github.com:ironruby/ironruby
Merge branch 'master' of github.com:ironruby/ironruby
Merge branch 'master' of git://github.com/ironruby/ironruby

Conflicts:
	Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec/command_line/dash_upper_s_spec.rb
	Merlin/Main/Languages/Ruby/Ruby/Hosting/RubyOptionsParser.cs
Merge branch 'master' of git://github.com/ironruby/ironruby
Merge branch 'master' of github.com:ironruby/ironruby
Add required Silverlight 3 and 4 runtime and SDK binaries so Silverlight builds can occur without having those Silverlight versions installed.
- Adds a SilverlightSdkPath MSBuild variable to Common.proj
- Updates package_slvx.bat to work in a Git repo
- Adds Clean.bat for cleaning all binaries
- Updates Alias.txt for Silverlight builds
Merge branch 'master' of github.com:ironruby/ironruby
Merge branch 'master' of github.com:ironruby/ironruby

Conflicts:
	Hosts/Silverlight/Scripts/package_slvx.bat
Fix for issue #4946.
Fixes KCoding bug in Silverlight build.
Fixed command line options
Converted relative path to absolute path for issue #25124
Merge remote branch 'upstream/master'
Added ExpandEnvironmentStrings which is new in the 2.6 version of the _winreg module
Fixed some path related issues that I found with the tests to get them running
Fixed up paths in alias script
Allow handler to get reused
Add SearchPaths from AppSettings. Fix loading rack without version
Use Ruby.CreateEngine() to eliminate having to put a language definition in web.config
added support for sift http as well, now it is complete
miedo
Merge branch 'master' of github.com:ljofre/kdd
test...
test2
tidying up a bit
beginning user interface fix
Fixes #27: Materials courses can create course categories
selectboxes implemented
Datashare fix
corrected display of imshow and bar() - there was shift between the two
Applied different normalizing methods to imshow
corrected nan's in imshow, code for imshow was cleaned
* Added more connections.
* No more qobject_casting :D
* Added bidirectional connections with Parent/Children about updating in
thread callback method.
* Removed copy functions in favor of Q_DISABLE_COPY macro.
* Implemented slots related to thread synchronizing and starting/stoping
all child generating.
fix bug for comments count and notes count && new blist bug - add book only when it's not exsited in the blist
Metric diven cleanups and break large classes

* Formal argument mutations are still very dirty :(
Change description from gameport to gamepad.
simplifies mdogo object
tweaks bootstrap, makes broker overridable
MIFOS-5838: Fixed negative principal on some installments
Merge branch 'j-maint' into j-release
MIFOS-5808: Changed redirection after payment from member account.
Add maximum_amount of parsed headers configuration parameter
Merge branch 'limit_number_of_headers' of git://github.com/bogdan/mail into bogdan-limit_number_of_headers
Updating CHANGELOG
Added textures for ore module.
Added module ores.

Added testing block "cross" to try a custom TE renderer.
Allow users to have their own logs in mixed-mode

If this is not the case, users can create but not delete their own gemsets:
  tee: /usr/local/rvm/log/ruby-1.9.2-p320/gemset.delete.log: Permission denied
  /usr/local/rvm/scripts/functions/utility: line 116: /usr/local/rvm/log/ruby-1.9.2-p320/gemset.delete.log: Permission denied
  Error running 'gemset_delete_task my-gemset ruby-1.9.2-p320@viptrainers-1.12.4 /home/user/.rvm/gems/ruby-1.9.2-p320@my-gemset', please read /usr/local/rvm/log/ruby-1.9.2-p320/gemset.delete.log
Merge pull request #1267 from lemoinem/features/allow-user-to-store-their-own-rvm-logs

Allow users to have their own logs in mixed-mode
upgrade gcc detection
Merge branch 'master' of github.com:wayneeseguin/rvm
Remove more sleeps from integration tests
Name an integration test properly
Adding -u to remove files
Add explanation to prediction, additional related work on PCA/ICA
clear in memory cache also
Update unit crashing aircraft -- neg xp bug
Reduce splahs sound but 40% and sizzle but 50%
Update customformation -- line bomber hotfix
Add preferences
Resolve merge conflict
Add cookie caching
Print last_modified for page
Add preferences access script
Add basic page caching
Query last_modified timestamp even if a cached version is present
Added broesel's crosshair switcher
monkeypatch usado para passar no teste tem que ser revertido no final #48
implementando a view com as opções de busca avançada
adicionando método na class "conteudo" para retornar todos tipos de conteúdo
busca avançada funcionando com alguns campos apenas
colocando a busca normal para funcionar novamente (apenas na home)
removendo teste de controller de buscas
removendo inutilidades dos testes de busca
modificando view de busca no acervo
added switch for emacs in gui vs. terminal mode
0.22 update
Version bump to 0.2.2
Regenerate gemspec for version 0.2.2
delaney.clj: added function that computes all autormorphisms of a symbol
Added missing style.scss
Some font colour changes.
Bug fixing
Bug fixing
Add RPC example
Updated patty gem to 0.0.9
Add timing info for Go #31.
Towards less code...
special case string snips that contain only newlines. This gets an
extra 1/2 megabyte is savings when opening up unit-size.rkt
v5.3.1 stuff
(cherry picked from commit d15059ada7882d5139e1df713e156e25f91b11ca)
Fix types of variable arity functions to work with 0-argument return values.

Closes PR13218.
Heterogenous -> heterogenEous.

Found by Ray Racine.
Add new versions of for/hash: and co that the typechecker can handle.

Based on Eric Dobson's implementation.

Closes PR13248. Closes PR13249.
updated auth rules
Simplify settings & set correct language code
DF#QCADOOMES-1004 Added hook for copying other production counting fields.
apc bug fix
img hover with random rotation
autovalidator & validation method added
Fixed phrases, so i'm using everywhere "link & linked account" instead of linked /associated account
Meine Zusischerungen
Merge branch 'master' of https://github.com/raptox/OOP
Serialisierungs File gelöscht
Zusicherungen
Merge branch 'master' of https://github.com/raptox/OOP
CSPACE-5650, CSPACE-5324: autocomplete widget will only issue 1 request at a time with a potential final request after the user is done typeing everything.
CSPACE-5674: Fixed a regression with term list search trigger.
datea main map displacement
api rewritten with always_return_data true -> backbone_tatsypie modified
Update README, going README driven style.
removed unwanted bin in composer
Update 40-steve-jobs.md
Ignore data dir
Add plists dependency
Satisfy ISO C90.
Revert to old object allocation method to prevent stack overflow.
Initial work to make Spark compile with Mesos 0.9 and Hadoop 1.0
Merge branch 'master' into mesos-0.9
Further fixes to how Mesos is found and used
Documentation
Documentation
Merge branch 'master' into mesos-0.9
Fixes to work with the very latest Mesos 0.9 API
Use Mesos 0.9 RC3 JAR and protobuf 2.4.1
Use Runtime.maxMemory instead of Runtime.totalMemory in
BoundedMemoryCache, in case the JVM was not started with its initial
heap size equaling its maximum one (-Xms == -Xmx).
Merge branch 'master' into mesos-0.9
Merge branch 'master' into mesos-0.9
Merge branch 'master' into mesos-0.9
Merge branch 'master' into mesos-0.9
Fixed the way the JAR server is created after finding issue at Twitter
Merge pull request #131 from rxin/master

Return size estimation, cache usage, and cache capacity from slave nodes to CacheTracker
Utils.memoryBytesToString fixed
BoundedMemoryCache.put fails when estimated size of 'value' is larger than cache capacity
Formating fixed
Added tests for Utils.copyStream
Little refactoring
CAN HAS MONO AND POLY !!!!!! HAPPY FACE !!!!!!!!!
lexer: added FUNCTION to BLOCK_USERS
fix
added initial android project
added block-specific output
Mejora el autolader de las clases de la libreria
moved email file user to hal/email
Begun User api
added FieldDefinition field
[vim] Add Conque as a plugin
skip the forking test in travis, it's flaky
web_reports: added a view to show the most common configuration problems
web_reports:  Trap KeyError from duplicate metrics

In the unlikely event two interactions point to the same
Metric, we could get a key error if they aren't in the same
interaction set.
re-rationalized service modes to make them more consistent and granular
doc: Instructions apply to all RHEL versions

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
PY3K: Refactor input code

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
OpenCSW: Add client tool

It seems like Blastwave is (mostly) dead. The opencsw fork appears to be
alive and kicking. This is preliminary support based on the Blast client
driver.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
+ install-gedit-plugins
Inspiration ETC upload
ok
Merge branch 'master' of https://github.com/t09h3r/one
Cleaned up eclipse meta's and launched test runs on another workstation.

Changelog:
Rem)    .metadata folder of eclipse removed completely
Test)   Tests runned on private notebook x64 windows 7 os
ToDo)   Re-add particular settings important for a seamless integration
Note)   No source code changes.

Change-Id: I0000000000000000000000000000000000000000
Signed-off-by: Martin Wilsdorf <Martin.Wilsdorf@googlemail.com>
un bloc thematique
Added Tiger Demo splash
Merge branch 'master' of https://github.com/tipam/pi3d
minor cleanup in bootstrap.php
minor cleanup in index.php; removal of exception classes
update of exception class names
http exceptions now in own class files
Merge pull request #10 from tapvt/break_out_http_classes

Break out http classes
Initial addition of requisite in statements - not pugged in yet!

This is the initial and barely tested commit for this feature, more to
come, but this allows for a "requisite in" statement. This makes it
possible to extend other requisites without making the big extend
block. It looks like this:

http:
  service:
    - running
  pkg:
    - installed
    - watch_in:
      - service: http

make sure to include things that you req_in!
Merge pull request #972 from trane/develop

Develop
Merge branch 'develop' of github.com:saltstack/salt into develop
missing :
fix typo in set creation
Handle keys with spaces (refs #852)

This patch is built on the assumption that we will at most have 4 things to add
to an auth line: enc key{ keypart2} comment
Merge branch 'develop' of https://github.com/saltstack/salt into develop
[arch][arm] fix a warning
[platform][stm32] fix a warning
[lib][cksum] add copies of adler32 and crc32 from zlib 1.2.7
[lib][cksum] add some console commands to checksum memory and benchmark
[project][armemu] add lib/debugcommands
class test-suite add
Added some scrollview-base unit tests
Merge remote-tracking branch 'upstream/master'
remove simulateGesture
remove event-gesture dependency
remove event-gesture dependency
build node-event-simulate
build loader
Removed gesture-simulation dependency and tests relying on it.
Merge branch 'master' of yuisource.corp.yahoo.com:yui3
Remove gesture-simulate.
Loader build.
Comment out gestureSimulate tests in charts example tests.
Merge remote-tracking branch 'upstream/master'
update travis to test branch
add master to yaml
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
revert .travis.yml on master branch
Merge remote-tracking branch 'upstream/master'
Patch to support title attribute for each column
Fix bad code sample in Y.App's docs.
Remove build.properties reference from intl docs.
Fix first weekday for lang it.
Merge branch 'calendar-fix-lang-it' of https://github.com/albertosantini/yui3 into calendar-italian-fix
Build files for Italian language pack fix
scrollToIndex now sets correct default value for easing (#2532895)
Build ScrollView
Replaced referece to Builder with shifter
More Builder -> Shifter docs replacement
Added Y.config.global, fixes #2532889
Added tests for #2532889
Gallery version bump
Merge branch 'master' into global
Flags added to article view
A way better method of checking for rbenv
Add install task
页面增加转跳到管理的按钮
样式
存储 查询 删除 连接信息
observer: add missing modules to app resource file (Noticed-by: Motiejus Jakstys)
du html, un peu d indentation, et l ajout de tournois
juste du cleanage de code -- se fait chier dans son avion, retard, bip-bip incessant, a mort les boites de conserves #Umad
petite modifs index et liste_jeux -- toujours dans l avion #Umad
ca sent le merge
merge ?
[103] Stacking Boxes

This patch solves 103. It is cpp because c++ sort is faster.
Starting from this patch, algorithm will be described in the source
but not in git log.
Update Mailgun
deleted:    global-6.2.2/gtags.el
	deleted:    gnuserv-3.12.8.tar.gz
fix user controller and friend service
fix search controller
Darwin Adapter BugFix
Merge pull request #91 from pmattmann/DBApp/setup

Darwin Adapter BugFix
move friend methods to service
Minor Bugfixes
Merge pull request #92 from pmattmann/bugs/minor

Minor Bugfixes
Merge pull request #90 from usu/feature/cleanup

fix user controller and friend service
fix event plugins
minors
Merge pull request #93 from usu/feature/cleanup

fix event plugins
Bugfixes in GitAttributesInstaller and GitHookInstaller
Merge pull request #95 from pmattmann/core/install

Bugfixes in GitAttributesInstaller and GitHookInstaller
Added receive + __hard_signal, changed __odometry
Plan van Aanpak bijna af
Merge branch 'master' of bitcstarter.com:~/SEGA
Merge branch 'master' of bitcstarter.com:SEGA

Conflicts:
	Modules/Steering.py
Merge branch 'master' of bitcstarter.com:~/SEGA
Steering functions complete
Merge branch 'master' of bitcstarter.com:SEGA
BUGFIX Sensors float conv
Control.py 0.9 finished, still needs testing
Merge branch 'master' of localhost:~/SEGA
Added Skeleton module
Alert.py stub
naamgeving ding: SENSORS -> Sensors
Alert functionality --Sensors.py ++Alert.py
Added Remote Control
Interface Module Added
Merge branch 'master' of localhost:~/SEGA
Adapt to new Control.py + code cleanup
Alert.py added
Merge branch 'arjen'
PICNIC Errors in Control.py (self. erros) fixd
corrected self closing span tags in the exoweb templates file

Signed-off-by: Bryan <mattheyan@gmail.com>
Added tests
Added a short roadmap to readme file
Added .DotSettings.user to ignore list
updated for version 7.3.744
Problem:    64 bit compiler warning.
Solution:   Add type cast. (Mike Williams)
Added tag v7-3-744 for changeset 26c8b3b49f74
Add toexcel extention
Add phpexcel extention
partially complete contracts report
pretty-print non-string simple error/warnings
sql_history: do not add all chats from history to Roster

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
history: fixed removing chat history

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
chat: do not allow Display names for Contact chats

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
chats: do not store invalid chats

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
build: Improve automatic dependencies handling

Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
build: Improve handling X11 dependencies

The USE_X11_XFIXES option was ignored by the source code, it was
always using Xfixes on X11 platform. And since no one complained to us,
I assume this option is unneeded.

Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
emoticons: removed Version setting, added Animate setting

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: re-enabled scaling in EmoticonSelectorButton

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: pass Emoticon instance to EmoticonSelectorButton

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: extracted EmoticonSelectorButtonPopup widget

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: use EmoticonPathProvider to display emoticon in popup window

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
emoticons: documented plugin + some small improvements

Signed-off-by: Rafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
Fix update errors
Sat May 26 07:59:24 JST 2012
CSS для вставки табуляции
Merge branch 'hotfix/1.0.2'
Fixed composer.json, added include-path
Merge branch 'hotfix/1.0.3' into develop
Generate cage sizes with either a multinomial or a Poisson distribution
Spilt solver into class separate from the puzzle

Different solving algorithms for the same puzzle with all serialize the same way.
Create separate solver objects with different algorithms
Implement linear complement constraint
Solver prints puzzle before attempting solutions
Sort by candidate number then cage size
Add difficult puzzle
Generate cage sizes with either a multinomial or a Poisson distribution

Currently hard-coded to use multinomial, but leave the Poisson code in.
Fixed TOOLS-1102.

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@128832 a5903396-d722-0410-b921-86c7d4935375
Reduce the number of editParts for one element, editing .gmfmap properly.

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@125447 a5903396-d722-0410-b921-86c7d4935375
Removing Helper node from tool palette

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@141630 a5903396-d722-0410-b921-86c7d4935375
Updating Documents.

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@129078 a5903396-d722-0410-b921-86c7d4935375
Enable serialization for missing properties in property mediator.

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@143116 a5903396-d722-0410-b921-86c7d4935375
finally seems to work
added setChromeTitle for subclassing

setChromeTitle allows individual titles in a subclass
added setChromeTitle for subclassing

override setChromeTitle in a subclass for individual titles
Merge remote-tracking branch 'upstream/master'
Changed Object type --> causes compiler fault
Fixed activeRequest-queue - adding of the identifier key was missing
b2
Fixed issue when setting cache size of thumbnail and high quality image caches.
Merge pull request #311 from OTrumpf/master

setChromeTitle in NetworkPhotoExample / solved cache issues
Simulate low memory warning on devices

  * Add + (void)simulateLowMemoryWarning in NIDeviceInfo.
  * Simulate low memory warning when tapping on NIOverviewMemoryPageView
Merge pull request #312 from senpo/master

Add simulate low memory warning in Overview
[attributedlabel] Decrease the radius of the attributed label highlight rect.

This ensures that the attributed label's highlight rect doesn't bleed past the bounds of the view.
[core] Add NIMinimumTapDimension.
[core] Add NSObject superclass to NI_FIX_CATEGORY_BUG macro to satisfy new compiler warnings.
Update docs with 1.0.0 information.
Update nimbus docset atom feed.
Update doxyfiles.
Fix bugs in documentation output.
Merge branch 'PointsConnectivityClean' into InterfaceCondition
Merge branch 'NormalCalculate' into InterfaceCondition
Add "FrictionlessContact_FiniteElementCalculate"
Added "FrictionlessContact_FiniteElementCalculate" to calculate element stiffness matrix for frictionless contact

Changed localLineFaceNumber to elementLineFaceNumber under InterfacePointConnectivityType
Add test for gap function penetration/separation, only add contact points contribution if the gap is a penetration
Merge branch 'InterfaceCondition' into InterfaceLinearElasticity

Conflicts:
	src/interface_operators_routines.f90
抵债发布图片
opengles1: include glext prototypes, prevents gcc warnings

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
mnit&linux: minor C code cleanup

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
mnit: complete doc of Display::blit_stretched

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
mnitc: corrects handling of failed Nit compilation

Prints error message and quits.

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
linux: adds Display::wanted_[width|height] to linux only

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests: adds displays test for resizing screen

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
mnit: removes y += 32 in blits used for Android

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests: adds missing android source file to moles

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests: intro the forest test, a client/server "game"

TODO: Android support for forest
TODO: Detect ctrl-c in server

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
.gitignore: removes *.nit.[ch] from ignore list

These were generated when FFI was managed by nits, now these are for
pure native interface hybrid modules only.

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests/forest: major code clean up of forest project

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests/forest: adds sigint support for server

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
nit: updated to latest upstream version + ffi and others

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests/dino: adds logo to drawings

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
tests/dino: change full name for android (its use is still broken)

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
Define O.engine with a default list at startup, with example script and notes in the documentation.
Codificacao UTF-8
not require BOT_PREFIX in type chat mode.
Update the YUI version used for the UI to 3.7.0.
Update app handling for run command.
Revert "updating gems"

This reverts commit e732edbe9d9eb190ae12b959cb1a8ca9da457fbc.
Trying to fix asset caching problem.
Re-enabling all features.
[#26719419] Strich am Rand eines Thumbnails entfernt.
[#26719419] Ansichten-Wechsler bei der Set-Ansicht reaktiviert.
[#27007579] Titel der Inhalte werden beim MediaSet Popup nun gezeigt (on hover)
[#27007579] Bei den Hover in der Erkunden-Ansicht den grafischer Rest entfernt.
[FIX CI] User goes to a set and create multiple sets and add one of them to the parent sets.
[FIX CI] features/step_definitions/examples/curated_set_steps.rb
[FIX CI] Content counter
[FIX CI] Moving resources into or out of multiple sets at the same time
[FIX CI] Rename a set
Version bump.
Conflict resolution.
Merge branch 'next' of github.com:zhdk/madek into next
More scenarios for list view.
improve filter panel feature
[FIX #21584091] fixing both edit keywords implementations (old edit form and new import inplace)
Merge branch 'next' of github.com:zhdk/madek into next
Slowly working our way through this mess.
on direct image request, returning an empty pixel when a set doesn't have any media_entries
activate parents/children for filter-set
Merge branch 'redesign' of github.com:zhdk/madek into redesign
Fixing display of Contexts

  actually, fixing creation of MetaDatumTerm when a Term itself is
  passed as an value
Merge branch 'next' of github.com:zhdk/madek into next
Upload process gone minimal, removing unnecessary separators.
scroll lines + css nav
nuovo template
Fixed/Finetuned some things after last refactor
initial commit
just kidding, this is the initial commit
shop order web
add user find password
user
Merge branch 'master' of https://github.com/zzswang/pp
shop manager
Changed day_of_week input field to full date.
新文件：    arch.png
	新文件：    awts
	新文件：    awts~
	新文件：    bz.jpg
	新文件：    calendar2.lua
	新文件：    diskusage.lua
	新文件：    du.png
	新文件：    rc.lua
	新文件：    rc.lua.new
	新文件：    rc.lua.new~
	新文件：    rc.lua.old
	新文件：    rc.lua.oldv
	新文件：    rc.lua.or
	新文件：    rc.lua~
	新文件：    scratch/drop.lua
	新文件：    scratch/init.lua
	新文件：    scratch/pad.lua
	新文件：    startup.sh
	新文件：    theme.lua
	新文件：    theme.lua~
	新文件：    themes/dust/awesome22-dust.png
	新文件：    themes/dust/layouts/dwindle.png
	新文件：    themes/dust/layouts/dwindlew.png
	新文件：    themes/dust/layouts/fairh.png
	新文件：    themes/dust/layouts/fairhw.png
	新文件：    themes/dust/layouts/fairv.png
	新文件：    themes/dust/layouts/fairvw.png
	新文件：    themes/dust/layouts/floating.png
	新文件：    themes/dust/layouts/floatingw.png
	新文件：    themes/dust/layouts/fullscreen.png
	新文件：    themes/dust/layouts/fullscreenw.png
	新文件：    themes/dust/layouts/magnifier.png
	新文件：    themes/dust/layouts/magnifierw.png
	新文件：    themes/dust/layouts/max.png
	新文件：    themes/dust/layouts/maxw.png
	新文件：    themes/dust/layouts/spiral.png
	新文件：    themes/dust/layouts/spiralw.png
	新文件：    themes/dust/layouts/tile.png
	新文件：    themes/dust/layouts/tilebottom.png
	新文件：    themes/dust/layouts/tilebottomw.png
	新文件：    themes/dust/layouts/tileleft.png
	新文件：    themes/dust/layouts/tileleftw.png
	新文件：    themes/dust/layouts/tiletop.png
	新文件：    themes/dust/layouts/tiletopw.png
	新文件：    themes/dust/layouts/tilew.png
	新文件：    themes/dust/taglist/square.png
	新文件：    themes/dust/taglist/squaref.png
	新文件：    themes/dust/theme.lua
	新文件：    themes/dust/theme.lua~
	新文件：    themes/dust/tp/cpu.png
	新文件：    themes/dust/tp/down.png
	新文件：    themes/dust/tp/fs_01.png
	新文件：    themes/dust/tp/fs_02.png
	新文件：    themes/dust/tp/ram.png
	新文件：    themes/dust/tp/swap.png
	新文件：    themes/dust/tp/up.png
	新文件：    themes/dust/widgets/ac.png
	新文件：    themes/dust/widgets/acblink.png
	新文件：    themes/dust/widgets/bat.png
	新文件：    themes/dust/widgets/batempty.png
	新文件：    themes/dust/widgets/batfull.png
	新文件：    themes/dust/widgets/batlow.png
	新文件：    themes/dust/widgets/batmed.png
	新文件：    themes/dust/widgets/blank.png
	新文件：    themes/dust/widgets/cpu.png
	新文件：    themes/dust/widgets/crit.png
	新文件：    themes/dust/widgets/disk.png
	新文件：    themes/dust/widgets/down.png
	新文件：    themes/dust/widgets/fs.png
	新文件：    themes/dust/widgets/fs2.png
	新文件：    themes/dust/widgets/mail.png
	新文件：    themes/dust/widgets/mailnew.png
	新文件：    themes/dust/widgets/mpd.png
	新文件：    themes/dust/widgets/mute.png
	新文件：    themes/dust/widgets/note.png
	新文件：    themes/dust/widgets/note2.png
	新文件：    themes/dust/widgets/note3.png
	新文件：    themes/dust/widgets/nowifi.png
	新文件：    themes/dust/widgets/pac.png
	新文件：    themes/dust/widgets/pacnew.png
	新文件：    themes/dust/widgets/pause.png
	新文件：    themes/dust/widgets/play.png
	新文件：    themes/dust/widgets/ram.png
	新文件：    themes/dust/widgets/temp.png
	新文件：    themes/dust/widgets/temphot.png
	新文件：    themes/dust/widgets/tempwarm.png
	新文件：    themes/dust/widgets/up.png
	新文件：    themes/dust/widgets/vol.png
	新文件：    themes/dust/widgets/wifi.png
	新文件：    wi.lua
	新文件：    wi.lua.old
	新文件：    wi.lua.or
	新文件：    wi.lua~
Merge branch 'master' of github.com:2mauis/dot1
recreate Eclipse 3.5.2 generated files
nice preloading of pictures
half way nas
Add bookmark+ package.
Fix import with 302 in LinkedDataWrapper
Scope error on properties
Autoload helper doesnt seem to work. Load in constructor instead. html_escape() is now safe_html(), html_escape() is already in use by Codeigniter.
after edit capability added
Notifications have their time added. Tested whether the GUI would recieve notifications before it was started.
GUI slides in and out. Updated service references.
more Objective-C and C keywords are now escaped
grammar: the built-in type classes are now valid expressions
fixed incorrect C++ code generation for sequences. more revealing type names in the generated code
removed two more relative imports
removed or fixed functools imports
portable way to get regex type
removed relative imports from POSIX tools
Added addons FileManager layout
Twee
Merge branch 'master' of github.com:Bv202/LeRoy

Conflicts:
	LeRoyWebApplication/LeRoyWebApplication.csproj
automatically reload the allhosts page every 2 minute
Change captured object not to receive shadows.
add drush aliases
up module views 3.5
up module uuid DEV : fix entity API bug
Merge branch 'core'
up drush aliases
Merge branch 'master' of github.com:DuaelFr/cec into prod
add module views_data_export
Merge branch 'core'
add feat administration
Merge branch 'master' of github.com:DuaelFr/cec into prod
up feat administration : add vbo and views_data_export dependencies
add module role_export
Merge branch 'core'
up feat config permissions : add cuisinier role
up feat profiles : add cec_profile_limit variable
up module cec_profiles : add manual creation
Merge branch 'master' of github.com:DuaelFr/cec into prod
up feat administration : improve inscriptions and conform to new roles rids
Merge branch 'master' of github.com:DuaelFr/cec into prod
up feat administration : fix roles bugs
up feat administration : add fields and filters to global view
up feat administration : add contextual actions
up feat administration : add title and message on global view
up mod views_bulk_operations
up mod features DEV
up mod entityreference DEV
up core 7.18
Merge branch 'core'
up feat personnages : remove select_or_other dependency
add admin theme cecadmin
up feat config_base : define cecadmin as admin theme
up all cec feat : position fields to improve admin UI
Fix typo in README
Alias equivalents of `key?`
Do deep key conversions for nested hashes and arrays.
Merge pull request #50 from benjaminoakes/master

Alias equivalents of the key predicate (#key?)
Minor code tweaks.
Merge pull request #52 from Erol/deep-key-conversions

Do deep key conversions for nested hashes and arrays.
Merge pull request #35 from jaimeiniesta/master

Fixed typo
CMA 4-5
Beer time ?
source ctags sur les machines de l'iut
Fixed basepath-problems
Added amazon linux detection
added project files, and sudo skeleton
update .gitignore to develop version
More fixture/codename work
Generation still has some issues, but tests are looking good, some fixups of codenames table manually in fixtures
Cleanup cardname
codename debug off
Added all the usual BLABLABLA
added article
validation
More readable http status codes.
Fix for issue #48
Use stable MathJax due to broken beta.
bugfix: disable submit only after validation
Merge branch 'master' of https://github.com/Jeeqs/Jeeqs

Conflicts:
	src/jeeqs.py
made good vfs changes
added cwd descriptor
added count to walk
Switch out the texture matrix array auto with numbered ones to match texcoords. Add TEXTURE_MATRIX0 support to the material parser
Add support for the TEXTURE_MATRIX1 auto uniform in material scripts
COMP: Fix compilation errors from recent patch merges

Change-Id: I5b22cc2b84b6a90a979d494ca7e78647a23b8086
BUG: SymmetricSecondRankTensor Pre and PostMultiply return wrong type

SymmetricSecondRankTensor's PreMultiply and PostMultiply methods
return a tensor instead of a matrix, but multiplying a tensor by a
matrix is not guaranteed to produce a symmetric tensor as a result.
Thus this method is throwing away valuable information in the lower
triangle of the matrix and producing incorrect answers as a result.

The solution is to return a Matrix instead.  Users of these methods
will be alerted that this has been fixed because their code will stop
compiling.  The SymmetricSecondRankTensorMultiply Migration Guide will
help them fix their code.  Also added a Rotate method that takes a
Matrix M such that for tensor T, T.Rotate(M) returns M * T * M'

Change-Id: Id67b52af2f78a4c56336e00680d4f2fdfaec408d
Merge topic 'FixCompilationErrors'

b274798 COMP: Fix compilation errors from recent patch merges
Merge topic 'SymmetricTensorMultiplyBug'

b4443ca BUG: SymmetricSecondRankTensor Pre and PostMultiply return wrong type
сделал отображение допсвойств поста по неджвижимости
добавил Gemfile.lock
Add another missing client function
réaffichage svg scénario
need dupe checker
Account for grid line thickness in drawing code

Mac had this factored in before, just adding it in to the
named version.
Allow passing nil to -[earlierDate/laterDate:].

If the argument is nil, it will return the receiver.
-[OFSortedList addObject:] -> -[insertObject:].

The rationale behind this is that otherwise, there are two methods
called addObject: with a different signature, the one from
OFMutableArray and the one from OFSortedList. As OFSortedList is
actually using insertion sort and all other methods on an OFList start
with insert anyway, this is also more consistent.
Added mbstring to Boxfile
its getting messy ;) (please read the extended Description)

Band: deleted Methods for Computing Costs -> Budget.java
Event: Now stores Members which play at the Event. Furthermore, added a
method for getting all the Songs, that are playable at the Event <---
This can't be a good solution!
Member: updated to store the repertoire of the member
Make it easier to append to the default sudo configuration
Logstash: do not always log to stdout
add test project

メモ用
GL用ファイル追加
modified about page as a test
Merge branch 'master' of https://github.com/Phaenom/WSC
cleanup:
updated readme
initial database upload
updated database
Merge branch 'wade'
marginMerge.html