labofsahil/github-event-dataset-2012 huggingface dataset:
Add tag data from Last.fm to output.

I'm not too sure about this. User-contributed tags aren't genres,
and their quality can be lacking, eg. tags like "albums i own",
"seen live", and other stupid shit of the sort.
Add multiple disc support.
prev next buttons for gallery window
fixed symboltable to allow 1 level of subgroups in searchGroups (eg, _sys.wx)
cleanups of symboltable from previous commit
added scatterplot support
updated docs
Added fast math functions and fixed issue #14 and possible issue #16 (although I can't test it because I don't have the device)
Added 3 new tutorials
Merge remote-tracking branch 'upstream/master'
Fixes typo in CHANGELOG.md
Merge pull request #314 from danehammer/patch-1

Fixes typo in CHANGELOG.md
fix rare bug in supervisor where it would continuously fail to clean up workers because the worker was already partially cleaned up
update changelog
Merge branch 'master' of github.com:nathanmarz/storm
support kryo decorators
added better comment, removed code that is never called
removed print debugging code
fix emitDirect in storm.py
update changelog
fix typo in changelog
added Negate meta-filter
conf normalization for kryo decorators.  added testing
improved testing of kryo decorators
fixed typo in comment
meaningless comment removed
Merge remote-tracking branch 'jason/kryohook'
update changelog and bump version
add helper for registering decorators
0.8.1-wip9
more configable. error mail
add travis-ci
add .travis.yml
update libraries
for bitbucket ?
change base to parent
add test for users api
modify delegaded method test
add more tests
Please extract common functionality and remove code duplication - HttpHandler vs BaseHttpHandler
added eclipse generated files to .gitignore
Renamed qrparse to better reflect what it contained
Fixed bug with <value> attribute disappearing in <code> block
Added more detail
Made it scale the QR codes on a pixel level
Added more error messages
Added error traps
Fixed up some of the javascript and formatting
attempt at splitting category basically
added innerHTML on HTMLDocument
refatoring embedded domelement
bug fixes on scrollbar and mouse wheel
child
added child as subtree
Fixing link to twitter bootstrap.
Try to resolve conflict
Merge branch 'master' of https://github.com/ylyin/hw2-team05.git

Conflicts:
	launches/hellobioqa.launch
	src/main/resources/hellobioqa/hellobioqa.yaml

	Kept one option for each phase
Merge branch 'master' of https://github.com/ylyin/hw2-team05.git

Conflicts:
	src/main/resources/hellobioqa/hellobioqa.yaml
Modify query expansion.
Corrected option name. Corrected typo.
simplify the code

get rid of the clientServer.h, make life easier :D
fix setup and subodules
serialization program
better way to remove
Using ConfigParser to separate configuration per API module.
Started AniDB and Melative implementations.
PEP8ness
added HtmlCompactor class, and several other classes that are under development

- probably not a good idea to use WebExtensions or WhitespaceModule yet,
those may get refactored.
added possibility to test via setup.py test, removed obsolete deps
Merge pull request #2 from alekzvik/master

Small changes in setup.py
change media query to fix horiz scrollbar
ololo2
Merge branch 'master' of https://github.com/zalepok112/ololo
Started working on create view and converted javascript to jquery.
Switched to postgres
Routing and views
add xml - default options
first incomplete implementation of users list with test case
Self-registering processes. Double supervisor idea sucked ass =/
got the readme added?
Added a date picker to the date fields. Ordering transactions by post date descending.
Add setup shell scripts
change some css @ login page
change CSS in demo.css , uniform.css , default.uni-form.css @ Login and
Register Page
Change CSS and JSP in Login and Register page before try jQuery UI
eiei
abcd
good
vv
eiei
eie
ee
eiei
eiei
eiei
eiei
eiei
eiei
latest
Now you can order any items. ;)
make addFocusedProperty more useful
Контроллер Pages
Изменения для статических страниц
конец 3 главы
конец 4 главы
поменяли маршруты, удалили index
Закончили шаблон и маршруты
закончили 6 главу
закончили 7 главу
Merge pull request #1 from 7regtw/моделирование-пользователей

моделирование пользователей
06132012 Changes
Added activiti-rest module to check profile
Fix errors and define 'self'
Removing postgres and sqlite dependencies.
style changes for the single staff page
Added the hypo dependency injection framework to data.js.
Updated entry for hypo to point to the un-minified source.
pkg.json npm>1.1 friendly, replace gzip with zlib
rebuild
Added one-validation
added pubsub.js, PR #273 + fixes by @federico-lox
Merge branch 'master' of https://github.com/Munter/microjs.com
rebuild
Added server2.js library
add Pjs https://github.com/jayferd/pjs
Added Histogram
Update master
Merge branch 'master' of https://github.com/thanpolas/microjs.com
rebuild
minor adjustment
clean up a couple of libs
Merge branch 'master' of https://github.com/jayferd/microjs.com

Conflicts:
	data.js
unversion Pjs source
Merge branch 'master' of https://github.com/Munter/microjs.com
Merge branch 'master' of https://github.com/malko/microjs.com

Conflicts:
	data.js
add sql wall test
Merge branch 'master' of https://github.com/AlibabaTech/druid
add StatFilter testcase for : OpenClobCount, OpenBlobCount, OpenInputStreamCount, OpenReaderCount
Merge pull request #99 from wenshao/master

add StatFilter testcase
sessionStatView add lastAccessTime
change refresh interval to 5000 millis
Rename package and add some attributes, preparation for referencing branch.
Add the valuesAsKeys parameters to Select->options() to force the use of array values as option values
Hare compiler basic integration
Merge branch 'gh-pages' of github.com:AngryLawyer/PL101 into gh-pages
Made up-to-date
available as module require
Config instance
uncommented tests
added indentation aswell, thanks to Steve Losh
Added action for creating a volume from snapshot

Added a new action to create new volume from
a volume snapshot. The snapshot_id is passed to
nova volume API. The 'Create Volume' form is
reused, with the 'size' value being checked against
the snapshot size, as it cannot be less than
the snapshot size.

Fixes bug 1023740

PATCH SET 4: Added dropdown to select snapshot source
in 'Create Volume' form, when loaded from /nova/volumes/
When a snapshot is selected from the dropdown, the name
and size are pre-filled in the form (I've removed
the description copy as it is probably specific
for the reason a snapshot is being created).

PATCH SET 6: rebased with master, fixed a bug with
get_context in nova/volume/views

Change-Id: I20dd8d698f5d8481938417557e09dcdc9b891e82
Fixed the bug with images returned as generator

After a fix in Glance to support pagination,
the list of images is returned as generator,
while api.glance expects a list.

PATCHSET 2: removed optional kwargs if None
PATCHSET 3: fixed snapshot_list_detailed.

Fixed bug 1027210

Change-Id: I1c68e3625c22e591776e83c742e7b94dc893f196
Merge "Added action for creating a volume from snapshot"
modifed to use actionbarsherlock
ListFragment shows list of results.
modified:   site/index.html
	modified:   site/js/Cloud.js
	modified:   site/js/Player.js
	modified:   site/js/Sky.js
	new file:   site/js/World.js0
	modified:   site/js/main.js
	new file:   site/js/physics.js

COmpletely revamped 'physics'. Added World class. Changed everything.
vim: add possible sourcing of local configuration
vim: check if vim can use colorcolum before using
Merge branch 'master' of github.com:Azrathud/dotfiles

merge due to long out of sync
Add wonderful to README
Implemented two chapter 5 exercies
Corrected file overwrite in previous commit. Minor Fix.
Refactoring client message handling code
ListDemo
Merge branch 'master' of https://github.com/Baternest/Android
Minor Fix: JPQL Grammar
fixed mixpanel env
added friendly_id to make search urls not contain id number
mom-15 Check the exit code of the model itself and return 1 on failure
Global namespace pollution - variables should be local
localization finished
removing matt
https://dev.mimuw.edu.pl/issues/1943
Debugage de hoa.binaural
had to check if process was running before checking if the url was reachable \nAlso used 'lunchy' gem in place of launchctl. I think the  wasn't working inside quotes
Adding expand_filedir_paths.py - It replaces all 'file.extension' resource file references with 'relative_path/file.extension'. This should speed up compile times by reducing the number of places the compiler must look for resources.

All credits go to thvortex of ss13-daedalus branch.
fixed cartodb.css files
removed JSON parse and replace it for html_safe rails method
removed all JSON.parse in all rails views
Merge branch 'release/v2.0' of github.com:CartoDB/cartodb20 into release/v2.0
Remove binaries from extensions

Remove the binaries from the `lib' directories of the extensions.
(closes #5).
Merge pull request #6 from Chabrier/master

de: fix a segfault GUI
de: update the item names inside the GUI

The glade file of the gui has been updated in order to use names
closer to the formalism.
Added new choropleth map tutorial
add 0.4.3 blog post, minor tutorials update
Add XML Data file
trying to style my data page
Minor fix to prevent angles from being too big + angles in degrees for robots
Basic bullet system
moved the activate and deactivate conda commands into a new env command.
Speed up BIC header scan by searching outwards from initial guess
C++ compatibility for header file
Distribute under GPL v3
Removed unneeded code. Moved line.
Change 'Fork' to 'Code'
Mob death from players setting them on fire is now properly detected.
Added *.pdb copy into target dir when in Debug build
new player choose grid + shown on everyone else's board
Modifies sendgrid_unique_args to be accessible at a class level
Fix bug fo theme caicai
Add some very basic html. Songs can be played via the web interface
WYIL: post-conditions are now working I think ...
Made the Minds into Singletons.
Made the Minds into Singletons.
Fix Addic7ed
Revisao parte 1
Fix: this must not be used inside static classes
Fix: ldap errors
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fixed MailmanSPIP problem + little refactor
Translated some MailmanSPIP strings
Forgot to add the copyright
Merge pull request #352 from marcosgdf/mailmanspip

Fixes to MailmanSPIP module
A few refinements to player control
documentation fix;
extracting signing process into Maven profile;
additional project metadata;
Added the ToSeconds macro

Since G_RunFrame advances the game world by 0.1 seconds then I added a macro to
convert a given value to seconds in game time
Modified g_monster.c to use the ToSeconds macro for some commands
Modified g_monster.c to have fire durations be 1.5 seconds
Created a folder hierarchy for all of the expert system rules

This folder is useful if you symlink this into expert/logic of the quake2
folders
Added a stage advancement rule

This rule will automatically advance the stage control fact as well as retract
the fact completely once everything is finished
Add gtk_reparent_* crash workaround

Does not really fix the issue (Which would be fixing gtk-quartz
gtk_reparent_* implementation) but is a basic workaround to avoid a full
segfault when clicking on the now playing entry.
[banshee-bce] fix repo url
Merge commit '8fd47de87fbe2'
[ticket/11103] Coding guidelines (SQL Queries)

PHPBB3-11103
problem 4 -fixed spacing
Vuelve a la pantalla principal al crear Curso
Idea + Blog fixes
Karma + About pagina
Site updated at 2012-08-11 15:56:47 UTC
Revert "delete?"

This reverts commit 82bfe08593a872c8b1faf185250994c4a3e1fc35.
More changes to mitigate:
CVE-2010-3843
CVE-2010-3844
Merge branch 'ettercap_rc' of github.com:eaescob/ettercap into ettercap_rc
Fixing build issues reported by Gentoo people
More build changes
More build system fixes
Added EC_WDG_SRC to source list
Added check for libcurl version in SSLStrip plugin
Changed CMakeList to include ec_ssh dissector only if SSL has been enabled
Merge pull request #6 from eaescob/ettercap_rc

Build system fixes
Bug 796739: Remove inline script of showcase apps (cuvevid and crystalskull)
Bug 811959 - Camera needs readcreate permissions because of bug 806503
Bug 809686 - Enable capitalization and suggestions for Contacts
fields. r=jmcanterafonseca f=djf a=blocking-basecamp+
Bug 809695 - Enable capitalization and suggestions for Task names.
r=kaze f=djf a=blocking-basecamp+
Bug 804634 - Update marketplace manifest URL to marketplace.firefox.com
Bug 810791 - [Clock] Alarm icon doesn't show in the status bar after setting an alarm.
Bug 812659 - Feedback app needs settings-read permission
Bug 805366 - Update ICAL.js a=blocking+
use ical strings instead of jCal objects for icalComponent. Fix bug where exceptions sent over their own copy of icalComponent data even though its the same as their parent & we don't use it
fix bug in weekly recurring events
decrease the amount of expansions
CalDAV auto-resync code when we need to blow away the db.
Bug 812684 - Add missing settings to settings.py
bug 812721 - fix typo and add a new l10n string
Bug 805269: Change the id of the show-profile string, r=vingtetun
Bug 804960 - B2G SMS: Management of Special ASCII characters in SMS must be handled by Operator Variant. r=kaze
Bug 810965 - Display highlight effect for selected search filter tab
Bug 796661: [browser] Implement support for 'custom-prompt' modals. r=etienne
Merge pull request #6376 from ochameau/post

Bug 796661: Implement support for 'custom-prompt' modals. r=etienne
Bug 805968 [Contacts] Add proper plural support to the simContacts-imported string
Make thread names unique for easier debugging
Update sql/updates/characters/2012_07_15_00_characters_characters.sql

 ( Error )
DROP TABLE IF EXISTS `character_branchspec`;
ALTER TABLE `characters` ADD `talentTree` varchar(10) NOT NULL DEFAULT '0 0' AFTER `grantableLevels`;
///////////////////////////////////////////////
'characters'
[Err] DROP TABLE IF EXISTS `character_branchspec`;
ALTER TABLE `characters` ADD `talentTree` varchar(10) NOT NULL DEFAULT '0 0' AFTER `grantableLevels`;
[Msg] Finished - Unsuccessfully



( is the repair to the error )

DROP TABLE IF EXISTS `character_branchspec`;
ALTER TABLE `characters` ADD `grantableLevels` varchar(10) NOT NULL DEFAULT '0 0';
ALTER TABLE `characters` ADD `talentTree` varchar(10) NOT NULL DEFAULT '0 0' AFTER `grantableLevels`;
1.1.0 (85% done)

Added comments (//, /* */) and improved existing functions. Added a lot
of new numeric algorithms and improved the returnsattribute.
Imaging: file uploading.
Make this check only in debug.
If the point is inside comment, it now navigates normally, not skipping out of it. If the point is outside comment, they are skipped as usual.
working import for amira
Added Cordova Navigator Confirmation dialog.
Scalability fixes to index_orphans method

- Grabbing all the Solr ids in one call is a problem when the nunber of
  id's is large
- Changed DB batch call to just select the primary key rather than the
  whole record with all the fields.
Second Line

Nyah hah haaah
RF - GFA for DSI.
Merge pull request #9 from stefanv/multivoxel_gfa

RF - GFA for DSI.
NF file coords.py added for providing transformations from image coordinates to texture coordinates or world coordinates
All my broken changes

Signed-off-by: Gaurav Munjal <Gaurav0@aol.com>
started on split, partially working
#145: Allow node create/ update in Overaly.
Merge pull request #146 from Gizra/145

Show overlay on node add/edit links
Challenge Mode support
adding jcr implementation
adding jcr
Refactored the derived artifact logic - it has been pushed into the
persistence manager now.  Callers (like the atom layer) no longer need
to do the derived artifact logic.  This allows Derivers to participate
in the same JCR session as the source artifact.  It also more easily
allows Derivers to modify the source artifact meta-data from content
(e.g. setting the WSDL targetNamespace attribute).
Merge pull request #91 from EricWittmann/sramp-104-derived-tx

(sramp-104) Derived artifact refactoring
Retrait systDist labo2
No longer include a metapatch of pkgsrc, just use `cat` of pkgsrc-patches/*.diff.
Renamed account lookup fields w/ "Org" prefix (fixes #49)
updated changelog
Splendidified
Tablets: Common Overlay: Add 7 navbar button option

Since we can now make use of this in the Tablet interface
it can now be raised from the default 5 to 7.
Signed-off-by: Curtis Menard <curtis.menard@gmail.com>

Change-Id: I8b4d235c199771dfa5c8da4812535979851955ee
Torch fix (1/2): add a separate APK to handle the torch

use an extrnal Torch APK instead of the internal Torch.java in
SystemUI. Doing it this way fixes all problems currently
happening with the torch

PS2: IMO this should go into phone_common, as tablets do not
necessarily have flash

Change-Id: Idec6da885197f871f825ddcb20e9c37c406152b0
Signed-off-by: Boris Bershadskiy <borisb13@gmail.com>
doc: smooth
compile: zlog-chk-conf no static, no need libpthread.a(which not exist on some OS)
bugfix: https://github.com/HardySimpson/zlog/issues/11
bugfix: kick pthread_key_delete, see https://github.com/HardySimpson/zlog/issues/9
test: make test_bitmap a little stronger
bugfix: using atexit to fix pthread_exit() not called in any thread
optimize: spec time cache for every thread
float2.hpp + float3.hpp -> floatN.hpp
float4 + unittests
Testblablablbal
Beginning to parse values
Ignore gem build directory
Ignore Finder.app turds
fixdns no longer breaks for non-running instances
Depend on pry-nav in development
More consistent logging
Refactor extensions to core classes
Update Gemfile.lock
Major improvement on configuration files. Backward-compatible.
Fixes commands for the new internal config format.
Fix README for the new config format
Bumped dependencies
Fixed specs; better argument handling
Fixed the Execute command
add collapsing of threads to a single process for the pie chart, BUG: whole chart becomes black on reload
Export now checks to see if bundle directory exists and create it if it needs to.
igor7787
Merge remote-tracking branch 'origin/master'
LoginAction.class.php
Merge branch 'develop' of https://github.com/IManager/IManager into develop
use remote mysql server
login Tpl/Login/login.html
Restore "Preview" button
581: Fixed styling issue with "my items" page and "search result" page.
Merge branch 'master' into 581-master
Merge pull request #129 from cindyli/581-master

581: Fixed the styling issues with "my item" page and course search result page
its aliveeeee
fixed some non Packet network accesses, added push_vector to Packet
Add 'assert' support
changed type info compare to no longer depend on string compares. fixed some issues in hashmap
Book Done
Moved Vectorizor to it's own repo
Merge branch 'master' of git@github.com:JRebirth/JRebirth.git into wip
Step 05 updates
Merge branch 'master' of github.com:JamesHight/kitcms
added searchResultSubtitleForRepresentedObject

This allows to show a subtitle string (such as email address) in the search table
Add descriptive comment to explain program's function
Some work on getting the physics collision callbacks to work
More cleanup
Finishing collision callback code
Debugging around, somehow the callback is never called... we shall find out why!
Use correct fontspec when trying to fit text.
Use smallest new guess.
Get the signs the right way round.
Revert "Ooops"

This reverts commit 15396ae5e4cca268f0334321c6ca00636e962c84.
New README.md
New font
WebShare | Initial
what?
fix lock check
enemy now takes dmg, problem with removing of shuriken
version 0.4
add worksheets dir to gitignore
merged master
commented out html5 test
Adjusted pages.js to new loader animation. Changed default $pRowCount back to 1.
some small other fixes.
Sanitize file name to ensure error messages dont display raw file name
of uploads. 
Merge branch '2.0' of ssh://github.com/Kunena/Kunena-2.0 into 2.0
Fix a small bug displaying topic with no messages
Fix #834: Trim / from path when saving the attachment
Fix #830: Main template override doesn't work
Fix regressions
Merge remote branch 'upstream/master'
Merge pull request #841 from mahagr/master

Fix #834, #830 and some regressions
meh
Merge branch 'master' of https://github.com/Kurios/4803AIGame

Conflicts:
	Caverns/Caverns/Caverns.csproj.Debug.cachefile
change behavior with some time period
new image
allow user to connect to the core, not only to configure it
add eg_string
rack protection fix fix
Added "Fireball" Attack

Press space to shoot fireballs.
unimpaired bundle installed
checksyntax, ctrlp, fugitive, supertab, surround bundles updated
World Manager

- Added a first version of a world manager, that is going to be handling
the worlds
Changed appname
Added tsjson() function
Added queu and activatei
forgot print statement
neue Optionen für efa-departures

* Anzahl der Ergebnisse
* Datum
* Zeit
ver mas para especialidades y apoyo al diagnostico
Cange the CSV layout
Stop RenderingManager incorrectly adding to m_RenderWindowList
removed lighting in odf mapper
Merge branch 'bug-11152-QballRenderBug'
Test for proper add/remove logic of render windows.
Merge branch 'bug-11154-renderingmanager-incorrectly-adds-renderwindows'

* bug-11154-renderingmanager-incorrectly-adds-renderwindows:
  Test for proper add/remove logic of render windows.
  Stop RenderingManager incorrectly adding to m_RenderWindowList
Added the dependencies which have to be on

The plugins, which are required for mitkDiffusion.

Warning: This requires the CTK DGraph tool to be able to handle more than 50 nodes, otherwise the configure step will fail.
Use update CTK with increased max vertex degree in DGraph utility.
Merge branch 'bug-11615-ctk-with-increased-maxdegree-dgraph'

* bug-11615-ctk-with-increased-maxdegree-dgraph:
  Use update CTK with increased max vertex degree in DGraph utility.

Conflicts:
	CMakeExternals/CTK.cmake
Merge branch 'bug-11564-resolve-transitive-dependency'
removed bundle IGT navigation (which holds the view IGTToolPairNavigation)
Merge branch 'bug-11571-RemoveBundleToolPairNavigation'
Replaced corrupt tracking volume with better model. Still not perfect in the joining region of sphere and cylinder, but should be glitch free.
Merge branch 'bug-11135-AuroraDomeTrackingVolumeSurfaceiscorrupt'
Using RequestUpdate instead of ForceImmediate update in mitkRenderingTestHelper
Merge branch 'bug-11008-2D-RenderingForceImmediateUpdate'
Deregistration of all QActions in the destructor.
Now the QActions are stored in a list with their descriptors.
Merge branch 'bug-10906-Crash_contextmenue_after_reinitializing_perspective'
catching negative dwi values according to tuch
Merge branch 'bug-11660-NegativeDwiWarning'
Add remaining relevant symbols from the Neo2 list
Comentarii + dedicatie http://www.youtube.com/watch?v=hMUSqPAgozM
チャット操作命令とメソッド
オフラインモードの時用のスーパークラス
牌譜処理からチャットログへの出力を再実装
AIのスクリプトエラーをチャットログに表示するようにする
#21 Aplicación de Códigos [IN PROGRESS]
#53 (1) Hacer que se carguen los 2 editores
- implemented YAML-File-Handling for default configuration of Modules
Changes needed to render DefineEditText.
Merge pull request #22 from kuu/master

Changes needed to render EditText.
added happies Game and added House model
Fixed some syntax errors.
Update demos and add Upload demo
Update hello.js with, CORS, file upload, better Google picasa handling
Update the documentation with Feature list, remove bad POST demo
Remove all knarly tests
Adding new unittest script
generate for most packages
All Std Libs that export (all but cgo)
make web Works Again
Starting to add T versions
Adding T versions 2
MergeDemoHelloWeb
Notes
TBuiltins
cmdline comma prefix for TEval
cmd line filename to source, or -c flag
Merge
Modify make.cmd to just make goterp.exe.  We'll run goterp by hand on Windows.
Add the "puts" command so we can run hello_world.
More formatting/indentation work. THIS. WILL. GET. PULLED.
Added birthdate to column in choose guest
coba Model
PEP8 fixes - breaks
Fix invalid transformation in InvertedSymmetricalLogTransform.
FIX nose.tools.assert_is is only supported with python2.7
Subplot.twin[xy] returns a Subplot instance
implement tight_layout.get_subplotspec_list and uses this to check if all the axes are supported by tight_layout
updated api_changes.rst to reflect the return value change of twinx and twiny
Turn get_sample_data into a much simpler function that merely returns files from an installed sample_data directory.  Include the sample data locally.  Remove sample data that is no longer used.
tight_layout.py: pep8 fix and some refactoring
closes #1173 - backporting python2.7 subprocess's check_output to be able to support python 2.6
Pickling support added. Various whitespace fixes as a result of reading *lots* of code.
ENH now can run the tests on test_backend_pgf by calling a python script on it
Added "new_figure_manager_given_figure" function for pgf backend.
py3 fixes for axes.py
Moved the utils/extprocess.py to the cbooks module - deleted unused import in cbooks
FIX undefined elements were used at several places in the mlab module
Deleted FIXME that had no reason to be
Merge pull request #1175 from pelson/pickle2

Pickling support added. Various whitespace fixes as a result of reading *lots* of code.
Merge pull request #1174 from NelleV/1173_pgf

closes #1173 - backporting python2.7 subprocess's check_output to be abl...
Merge pull request #1170 from leejjoon/fix-tight-layout-condition

Uses tight_layout.get_subplotspec_list to check if all axes are compatible w/ tight_layout
Merge branch 'issue498' of git://github.com/mdboom/matplotlib into mdboom-issue498

Conflicts:
	lib/matplotlib/cbook.py
Merge pull request #1183 from NelleV/mlab_fixes

FIX undefined elements were used at several places in the mlab module
Update Makefile & Gentoo ebuild to play nice which each other @ install
New: Added NzbClub.com as an indexer, enabled by default
Add new example with cookies
refactor to generic repository
Fix compilación v4
fix 01a
-Fix: pad HallOfFameStruct to 16 bytes. Some compilers to that on their own, others dont

This also makes our hallfame.dat compatible with original Dune2.

WARNING: current hallfame.dat might be corrupted now, and your Hall Of
Fame might be reset. Sorry about that.
Transparent migration of index serialization formats was implemented.

git-svn-id: http://orient.googlecode.com/svn/trunk@5192 3625ad7b-9c83-922f-a72b-73d79161f2ea
HTTP: fixed bug on retrieve of profile archive data

git-svn-id: http://orient.googlecode.com/svn/trunk@7407 3625ad7b-9c83-922f-a72b-73d79161f2ea
Added spawn chance parm
added psake to tools
updated gitignore to include temp files and artifacts from NuGet creation
pulled tests out of sln so that i can test the build process
added helper scripts from other project
pulled net40 output for now
updated license in nuspec to match repo
requireLicenseAcceptance = false
Merge pull request #2 from shiftkey/NuGetBuild

[WIP] NuGet Build Scripts
Update README to indicate repo move
ok
Merge branch 'master' of https://github.com/PatrikSB/OpSysLab
join funker, alarm funker, condition2 funker,
alt funker, bare oppgave 6 igjen
Traffic Updates
Ensure severity is correctly colour coded, and also improve visibilit/sorting of data.
TODO - Figure out text for Levels 5 and 6.
Updated mailing list URL
Update GitHub repo URL
Update GitHub repo URL in README
Update GitHub repo URL in Makefile.PL
Update GitHub repo URL in helper script
More GitHub repo URL changes
Changed the theme portfolio URL
Updating version number for WP.org release
Merge branch 'staging' into mypwork
Neighborhood update (wrong params was passed)
Small styling tuning
Widget handler update
Add ltrim(), rtrim(), and the combining trim()
Added option for clock in the centre of the status bar
gz-14: Changed secret key and client secret ID in the settings file to invalidate the old keys that are publicly visable. The new keys will only be visible in the private repo on PolicyStat.
gz-14: Moved the user creation form to a new page that is linked from the login screen.
gz-14: Fixed syntax error in urls.py
gz-14: Fixed indention error in views.py
gz-14: Improved the naming of the form handling functions.
gz-14: Fixed consistency issues with new name changes.
gz-14: Fixed some naming issues in the new template for the user creation page.
gz-14: Fixed consistency issue
gz-14: Moved the ablility of the user to change their Zendesk API token to a different form outside of the normal profile data on the change account data page.
gz-14: Fixed some errors in the new form layout caused by naming issues.
gz-14: Adjusted the profile change form to display the initial values for the current user.
gz-14: Did a number of styling enhancements to the home page and the app as a whole.
gz-14: Improved the styling of the form submit buttons and hyperlinks in the app.
gz-14: Updated the pages in the GitHub OAuth flow to use the new styling used in the forms.
gz-14: updated README with new configuration instructions.
gz-14: Changed the highlight color for hovering over table rows.
gz-14: Changed the home page so that it now uses tabs to seperate the different data tables. Also, made small table styling adjustments.
gz-14: Added a fake data entry to test broken enhancements. It's currently commented out.
gz-14: Added the amount of entries in each table to the tab titles. Also, adjusted a couple css settings for coloring for hovering and attention.
gz-14: Date sorting in the enhancement tables now works properly.
fix scaffold for new regime
Multi-reference property implementations:

- Added multireference_sourceid_property, multireference_source_property,
  multireference_targetid_property, multireference_target_property
  implementations.

- Use multireference properties for Group and User.  Group has both
  ``memberids`` and ``members`` properties.  User has both``groupids`` and
  ``groups`` properties.

- Group no longer has connect/disconnect/get_memberids/get_members methods.
  You're now expected to use its multireference properties instead.

- User no longer has connect/disconnect/get_groupids/get_groups methods.
  You're now expected to use its multireference properties instead.

- Change groupfinder implementation to use user.groupids rather than
  user.get_groupids().

- Change GroupPropertySheet and UserPropertySheet implementations to use
  reference properties rather than setters/getters.

- Root implementation changed for new regime.
- The substanced.site package has been removed.

- The interfaces.ISite interface has been removed.

- The substanced.root package has been added.

- The substanced.root_factory API function was added.

- The substanced.event.RootCreated event was added.

- The substanced.event.RootCreated event was added
  When used as a Pyramid root factory, it creates an instance
  of the content type 'Root' (passing it the settings from the
  config file).  It also sends the RootCreated event once a root
  object is created.

- Instead of subclassing Site and overriding its constructor to
  influence what happens when the substance d root object is created,
  it's now intended that users either:

  - Create and register their own Root content type which has a factory that
    accepts the settings passed by the config file.

  - Subscribe to the RootCreated event and mutate the default root
    object.

- The substanced.helpers.get_site_title API was replaced with a
  substanced.helpers.get_sdi_title API.  This function attempts to acquire
  an "sdi_title" attribute up the lineage instead of searching for
  the title attribute of an ISite object in the lineage.  The default
  Root object has a propertysheet that includes this attribute.

- The blog demo, the substanced scaffold, and the tutorials were changed
  for the new regime.
site package no longer exists
small change
Merge branch 'master' of github.com:QiWang1989/cs157a
Sender email changed.
Correction.
Further Corrections
Correccion
Corrección
Correction.
Removed Meta Tools
Updates to name display.
Preferences: Remember last selected section.
Backend support for setting per-domain UserAgent.
see #399
about page & logo & search target ...
merged with marions latest version of unicorn
Display full requested range for metrics
removed ldap code
Mudança cor de invalid verification
slug removed when creating company
	modified:   app/controllers/public/companies_controller.rb
	modified:   app/controllers/rasocomp/users_controller.rb
	modified:   app/views/public/companies/new.html.erb
	modified:   app/views/rasocomp/users/index.html.erb
	modified:   config/routes.rb
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/views/public/companies/new.html.erb
	app/views/rasocomp/users/index.html.erb
Sysstat lib: default c-tors fixed (issue #480)
delete debug-warnings
Manual annotation
Commit para timepicker y dropbox
Merge branch 'master' of git://github.com/ReyDoz/Vecinos2.0
Añadir varios archivos en incidencias
Rss incidencias
Agregado datapicker a Junta y formulario de Incidencia
15 mayo
Unido a TOny
Añadido configuración para Dropbox
..
Merge branch 'master' of git://github.com/biruwon/Vecinos2.0
Añadida parte de mostrar imagenes de incidencias
Migrando de lamp
Merge branch 'master' of git://github.com/biruwon/Vecinos2.0
diagram showing dll relationship
Second commit

Signed-off-by: Daniel Cousens <daniel350@bigpond.com>
[bug 176]
Make a few frequent methods not throw exceptions if called on an offline player
More Deploy
Fix double negative in TurretOwner check.
Added basic warpcore code
added warpcore dependencies
SQLConnection hinzugefügt, Subject implementiert
Laptop-Wechsel
2
[#2165] Shift mousedown prevents contenteditable.
[#434] removed function param that was not needed, and variable name change.
Debug.h no longer depends on String.
Included String into testcase for HashMap, fixes compiler error.
Added TRAITS macros to vim syntax file
Merge branch 'master' into concepts
If there are invalid sessions and there are no X logins, just return None, None so it doesn't crash
first commit : Add test files.
Deleted unused SHKViewControllerWrapper class
Update ShestakUI_Config/Locales/Taiwan.lua
Merge pull request #47 from leg883/patch-15

Update ShestakUI_Config/Locales/Taiwan.lua
- Added <Plug>(neosnippet_register_oneshot_snippet).
update fody
use overwrite to reduce errors
bump version
update self
Remove warnings
Started work on the super run function
joint work with Anastasia Izmaylova and Jan Kurš
bumped version
Add colours for messaging.
Add parsers/serialisers for few more packet IDs
added initial (slooooooow) lighting work
nconf configuration
Configuration
fixed some code styling issues
moved some config from server to game
added default config inside server.js
added server:host config
huge improvement to lighting routine
added optimist and the ability to specify config files on the command line
100% more block lighting, 20% less stack overflows
added some completely random (noooo) glowstone
clamped maximum relative move packet values down to 3 from 4
Merge remote-tracking branch 'upstream/master'
Release 3.1
Change version to 3.1-SNAPSHOT
Automatic merge from branch-3.1
now random generated piecesw
added Obj class (empty)
added empty obj base
...
Merge branch 'master' into gen-devel
Fixed test and added submaterial check
Add/Get RigidBody API to Entity.
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Input

Signed-off-by: Jack Huey <kitskub@gmail.com>
Merge pull request #334 from kitskub/input

Making input work
Various GUI additions.

- Added DEFAULT_FONT to SpoutRenderMaterials
- Re-organized TextModelComponent
- Added set/getPasswordCharacter to TextFieldComponent.
Signed-off-by: Chris Sanders <zidane@outlook.com>
refactoring de la couche service
ajout commentaire service
added an possibility to provide start/until for multiline substitution in file
substitutable attributes in the slapd conf file span multiple lines - use new version of block substitution function with start/until
demonbuddy plugin added
Fixed text wordwrap freeze.
Tweaked the splitting and spellchecked! :p
Updated PokedexNumber
Merge branch 'nativeAndroid' of git@github.com:TableTopGT/pkmncc.git into nativeAndroid
ファイル追加 #1
neural network
new file
not yet working, properly
- Fix for TESB-6277
Fix untasteful shell aliases
Present tense commit summaries
Increase histsize tenfold
Add autoenv in antigen
Add pythonrc (for readline) and set PYTHONSTARTUP
Add command-t submodule
Update pathogen
Fix mistake in vimrc
More wildignore
Try wildmenu
Add <leader># macro for quick Ack
Only UserMain
fix a bug of Cobertura configuration.
[Lu/Fedalto] - Home Page Tests - Removed the old test that was failing.
some typo fix + adds video link
Modified simulatorTick()
added xUnit Runner
renamed refactorings based on tests
rename refactorings based on observations
extracted ConstructFindings
removed switch statement by using a dictionary
collapsed Find method
Update pt_BR.po. VERY THANKS to Rafael Ferreira.
Update it.po. VERY THANKS to Marco Paolone.
Update sk.po. VERY THANKS to Slavko.
Update ru.po and uk.po. VERY THANKS to Vladimir Smolyar.
Update de.po. VERY THANKS to Mario Blttermann.
Update po files.
 * Release 0.9.9.1
registerservlet
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
remove milestones
Fleshed out the stub functions and added some tests

Also added a .clear() function for removing widgets prior to creating
a new toolbar.

The tests should demonstrate how to use the API
scheduling works, but lots of print statements

added emptyRoom and unassigned locations to deal with problems.
changed some print statements to DEBUG_PRINT
Merge branch 'schedule' into dev
Merge branch 'dev'
More experimental chat fixes
Bye-bye, invisibility potion!
RobbitNetherHelper.sortOutNetherPortals should now work for any entity, not just players
Hopefully items being thrown through a portal should now behave similarly to players...
Tidying up cross-dimension entity teleportation
Update to Forge 337 + FML 420
MCP does indeed deserve credit - good job cpw :)
Merge in changes
Added "getoutBuf"
Modificación al arbol de archivos

Diferentes diseños dentro de la carpeta 'designs' (Ípsilon es el diseño
de yamilé), carpeta 'pikachu' contiene códigos de práctica.
impelemented a simple taskplaner
[maven-release-plugin] prepare release v1.0-M1
Merge branch 'master' of github.com:Unicon/cas-addons
Prepare for release
[maven-release-plugin] prepare release v1.0-M1
Added a configuration file. Fixed some stuff along the way.
frames function is added.
finished screen switching for party mode, TODO: main party screen an some game logic
camera snaps less aggressively, more uniform default Cancel naming.
Merge branch 'master' of git://github.com/WhatPumpkin/Sburb
changes to the way focus is handled by the engine
Merge pull request #117 from Gankro/master

Changes to focus handling
be better at handling timezones that already have tzinfo set
Added cctype functions
Added strtoul functions
Began implementation of Landscape json persistance.
Currently writes landscapes and environments, but not members of the latter.
Moved files up from www directory to bin directory.
Fixed template path following directory reorg.
Fixed path to SQL following directory reorg.
ipv4_address_net_interface_list now returns dictionary with network interface (MAC) address as the key. This makes it easier to relate IPs to FQDN with host_net_interface_list.
Renamed method associated with /ipv4_address/net_interface to ipv4_address_net_interface_read to ipv4_address_net_interface_list.
Now performs DNS updates using dentros.dns.serverbind.
Limitations: security information from command line, DNS server used is localhost, reverse zone hardcoded.
#63: First effort towards Windows exe launcher. Non-functional.
Removing performance test files from solution.
Initial Commit
Bjoerns Aenderungen per Hand uebernommen
Gemfile geaendert durch lokales bundle install
Kleine Aenderung am Model der Abouts
Versuch, die unsichtbaren Bilder sichtbar zu machen
versuch von dropbox einbindung
dropbox einbindung gescheitert, nicht sinnvoll
Bildersystem geaendert
Additionals Datanbank aenderungen rueckgaengig gemacht
Kleines Missgeschick behoben
Kleinerer Fehler Behoben
Kleinerer Fehler Behoben
Readme editiert
Bildreperatur
Bildreperatur
Bildreperatur
Datenbank gewechselt
Additionals reset deaktiviert
Kleiner Bugfix in der Additionals Admin Form
Versuch, den Mailer in Gang zu bringen
Added arrays
Third chapter
add Notepad2/Notepad2-mod in the application's list
enable /LTCG for Release builds
dmake: add VS2010 project
vs2010 projects: consistently use /MP and remove default property
move astyle options to astyle.ini and use it in runastyle and runastyle.bat
tabs to spaces, remove trailing spaces and extra empty lines at the end of files
update TinyXML to v2.6.2
moved file structure around to be like velox and added .htaccess
removed index.php from config
toggle en las categorias
First commit. Accounts(device) + WindGenerator + Bootstrap for admin part
Fix merge
Results seem ok
fixed the inheritance of the previous commit
ProgressBar: removes args checking
Removed entries from database, fixed #103 + Regex update, fixed #105
Imported values from excel (only from 2012). Bug with the price. #83
check
2222222222
//
//
//
//
Merge branch 'newnewBr'

Conflicts:
	test2/src/test.java
new
Merge branch 'newnewBr'

Conflicts:
	test2/src/test.java
im
sdfg
asdf
asdfas
Merge branch 'newnewBr'

Conflicts:
	test2/src/test.java
sdfg
sdas
Merge branch 'newnewBr'

Conflicts:
	test2/src/test.java
Thread-proof the buffer implementations.  This also means that there is a new ctx struct that is carried around by the gpudata structs.  Should write a getter for it.
can create sonoform from patient
added get_socket_path util method and fixed unix socket server example to accomodate changes done in socket server class contructor
updated JAXLFsm to accept new states which are outside of extending classes (see https://groups.google.com/d/msg/jaxl/GP8HO9mhC1s/miVaJcjDtlsJ for details)
added a title helper
added Blueprint CSS
added css to app layout
added Blueprint CSS (to the correct directory this time)
Use a Thread for each module
Merge pull request #1 from ryanlower/thread_per_module

Use a Thread for each module
No need to install launchnode
VESPERS: Changed the colour of the resume button on the bottom bar after a beam dump.  I chose yellow for now, see how that works.
Forgot Q_INVOKABLE.  Caused all kinds of havoc and took forever to find.
pesky divs.
Updated links to point to github.
Merge pull request #51 from adamsilver/master

Remove jessie direct reference
Merge pull request #52 from adamsilver/master

deepMixin references correct func now
forked rendition for getText/setText
committed darrenscott
Change README.md: conflict festival2
Merge remote-tracking branch 'origin/master' into tvoliter/issue-541

* origin/master:
  In coordsChar(), skip hidden lines at the end of the document.
Fix scrollInlineWidgetIntoView to pass bottom of rectangle to scrollIntoView in all cases
Merge pull request #53 from adobe/tvoliter/issue-541

Fixes issue #541
lighter logs
A sample diagrams generator added to the integration tests. The tests are available from Timeline menu. Note, that default diagram is now empty.
branch 1 commit
Merge remote-tracking branch 'origin/test-branch'
css fixing for lists on content
Merge branch 'master' of https://github.com/agricgear/website
add a Pad-specific user interface for the timer settings
update Pad-specific user interface for layout/size settings
add dick plugin
Merge branch 'master' of github.com:aheadley/hesperus
Revert changes from 4c58f6d1119ae

The newly added `recently_edited_plots` method uses
fields that do not actually exist in the database.

Since I can't be 100% sure what these fields are actually for,
and the fact there is only one date field on a plot, I've
replaced the offending field (date_planted) with `last_updated`.
Remove last_updated field altogether

Also update templates
Merge pull request #16 from ahinz/topic/fieldfix

Revert changes from 4c58f6d1119ae
Makefile changes
Compilation fixes for CUDA code
begin Koala integration
applied blank check fix for log url and phone
changed blog_url check to use blank
Merge remote-tracking branch 'upstream/master' into home-page-row-fix
archivos
Merge branch 'master' of github.com:akarpovsky/SOTPE1
Resize gmap on closing results div
fixed to current view
Week 7 Controller
Update to XCode 4.5

Update project to use Xcode 4.5. It provides nearly complete C++11
feature set.
Make use of new C++11 features
Support gzip decompression in Jython

* Move current GzipDecompressor from util to platform.common, use on Windows
  and POSIX
* Create Jython-compatible GzipCompressor in new platform.java module
* Tweak tests to be more accommodating to Jython's zlib implementation
Cover supported interpreters in README
fix SE bug that throws js exception
sending users for specific room.
Save the terminal profile.
Merge branch 'master' of github.com:alinpopa/dotfiles
encode < and > in readme
Added homePage to doc
only show first 2 weeks in statistics graph
[Closed issue #10] Load main menu items orderes by label

- Closed issue #10
- Some UI improvements
[Closed issue #12] Generate Bootstrap form elements
Added media test images, finished CSS and HTML markup for media module.
Pending this due to pending edition support
Fix the test for guides
Use a match_all query for the sitemap.

It's probably about equivalent in performance and semantics to using
'*:*' as a query string, but the intention is more explicit.
redirect to root, not back
SoftwareRenderer3: Updated to raster3_ryg7.
Added Convex Geometry
Added vertex uv calculation of ConvexGeometry
Added ConvexGeometry into build script
Added example for ConvexGeometry
Merge remote-tracking branch 'qiao/dev' into dev
Added UVs handling for ImmediateRenderObject.

Also added optional quick-and-dirty UVs for MarchingCubes object, just to be able to test this. For the moment these are just XZ world coordinates.

This should address half of #1834
src/extras/geometries/ParametricGeometries.js -> examples/js/ParametricGeometries.js
webgl_geometries2.html
yet more uv fixes in ParametricGeometry.js
cleanup the ParametricGeometries files
Merge remote-tracking branch 'zz85/master' into dev
Small tweak.
SoftwareRenderer2: Uncommented drawTriangleColor3.
SoftwareRenderer2: Faster clearRectangle.
Optimisations to SoftwareRenderer2. Added SoftwareRenderer3 featuring @rygorous's awesome rasteriser algorythim.
Sadly SoftwareRenderer3 is much slower than SoftwareRenderer2. I have the feeling it's drawing outside the buffer. Need to investivate.
Simplified grid creation code.
I guess other examples that have grids should also use this code. Albeit is probably not intuitive enough yet.
Added renderer.deallocateMaterial.

This should address #1803

Todo:

- write some test
- hook this into material.needsUpdate handling
- figure out what to do with GL shader objects
More Closure compile warnings / errors fixing in examples/js.
Rename heroku app from 'web' to 'test-game'
Changed DAL to all ADO.
Missed one conversion in previous change.
SObjects (i.e., elements' and groups') constructor sanitized away from * magic.

In the process, discovered and fixed a pair of bugs (triangular numbers were not integers).

Now, in batch mode, error messages thrown by the program are displayed.
Reinitialisation mappage + crud
MovePicker: determineMoveBasic: fixed indices of first two for loops
Parser: took out println in parseMessage
upgrade to Spree 1.1.0
first commit in f1 branch
Organizzati import e format
MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()
MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size()
Removed all CMakeLists.txt do improper scriptings.
CMakeLists need a rewrite.
Created pages repository
Added gh-pages
start/stop btns
almost an answer
removed .project from git
took bundle out of gitignore, and switched to pg
optimizations and FPS tests
optimizations and FPS tests
optimizations and FPS tests
Update to jetty-maven-plugin 8.1.4.v20120524

git-svn-id: https://svn.apache.org/repos/asf/karaf/site/trunk@1423907 13f79535-47bb-0310-9956-ffa450edef68
First pass at tool for dumping schema to a CSV
Merge branch 'master' of github.com:apavlo/mongodb-d4
Added new --random-sessionizer option to work around some bugs
tried to optimize the lrubuffer by reducing hash operations...but failed
added: read design from output text into a design instance
show enqueued state in admin for tx log
Bugfix: NFS daemon failed to start on RHEL/CentOS