labofsahil/github-event-dataset-2012 huggingface dataset:
adjust log box zvalue
Remove "AI Melee"
remove "extend dashboard" and "kick"
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha
minor formatting issues
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha
Added frenzy mode
adding templates directory with test template
fix filenmae reference
unused import
error code for quick fix
unused import
sp error in comment
oops, code was badly-merged
test for #326
"minimal" fix for #326
tests for #330
perhaps-not-robust fix for #330
Add a variant of ProducedType.isExactly() which allows us to distinguish a type from its self type
Merge pull request #332 from tombentley/selftype

Add a variant of ProducedType.isExactly() which allows us to distinguish a type from its self type
Fix #325
add warning for unsupported feature
extra test
Fix #328 arbitrarily deep nested imports
another test
fix #317 improve error message when a return statement is missing
error codes for quick fix
squash npe
Removed check in Unit.getImportedDeclaration that prevented inner static classes from being imported (#328)
Add patches to gdm-3.5.90
fix for long run without losing database connection
esqueci
Merge branch 'master' of github.com:gfelizola/consultorio
Death Knight: Corrected Base Attack Power bonus of "Summon Gargoyle"
Initial commit by Gigo 814
Initial commit by Gigo 814 pm209
Improve the README
readme, tabify
allow compound and exists assign to take an indented expression to the right like the regular assign op
allow trailing commas in argument lists
Merge pull request #77 from gkz/allow-trailing-commas

allow trailing commas in argument lists
Merge pull request #75 from gkz/compound-exists-assign

allow compound and exists assign to take an indented expression.
add .gitignore in bin/
Added preference for using notification instead of activity and
implemented onReceive to account for this
Ooops, remove forgotten vim swap file.
added some more patterns
Adding logout option in layout
(ARM) MLA
max_length can also be guessed from Length
Removing reference to creating an issue for features
added "disable post functionality" so posts can be disabled from view but still exists in the database.
viewer test again
edited game.py
Client Settings, Language
fix not change image if there is no roll over image provided
Put images in a directory.
run forever...
Wow concurrency, also add a timestamp to keep things in order.
Added annotations
Bug fix: session
Added Message#notice?
NOTICE message (#26)
Added grant-writer.js
Add generic doctype to fix certain print stylesheet issues for IE. Ideally it should inherit the parent window's.
Signed-off-by: Harinath <harikine@gmail.com>
travisci: test hook is called script not test
POS Unigram/Bigram/Trigram & Removed nonzero warnings from svm-scale
calendar type
Some crude 2d histos.
Added new examples tex files.
Merge pull request #137 from hhugo/master

add camlzip to ocsigenserver optional dep
Fix aws url
Remove cmigrep
Repair easy_format patches, which seem to be completely broken...
Merge pull request #141 from mirage/master

fix easy_format
fix the various imagemagick libraries

* add ocamlfind dependency
* match the version number of the tarball to the pkg version
Merge pull request #142 from mirage/master

fix imagemagick
filtrado vias
Merge branch 'master' of https://github.com/highapps/bicineta_app
Fixed bug, tag request cannot URI::Escape::escape \x{NNNN}
new reload operations added
Some changes in Finder settings
Prepping for renaming from sciencelube to scilube
Cleverer HomalgFunctor for morphisms: better recognition of zero and identity morphism
fixed a minor bug in HasCurrentResolution
Added omitted Body.pushln()
Merge pull request #89 from janlugt/master

Added omitted Body.pushln()
easier way to get enum name
moved / changed return statements
one more return added
do we need print statements for map accesses in gm_reproduce and gm_dumptree?
added multiple output files
giraph backend generates separate files for main, vertex, inputformat and outputformat
Merge pull request #90 from janlugt/master

Giraph backend generates separate files for main, vertex, inputformat and outputformat
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl into java_conversion
changed some classes to inner classes
small fixes
changed hashmaps to maps/treemaps
gna
Merge remote-tracking branch 'janstream/java_conversion' into java_conversion

Conflicts:
	compiler_java/src/main/java/frontend/find_hpb_t1.java
	compiler_java/src/main/java/frontend/gm_frontend.java
	compiler_java/src/main/java/frontend/gm_rw_analysis.java
	compiler_java/src/main/java/frontend/gm_symtab_entry.java
	compiler_java/src/main/java/frontend/gm_typechecker_stage_3.java
	compiler_java/src/main/java/frontend/gm_typechecker_stage_5.java

merged
add TextBoxWidget that handles line wrapping
use TextBoxWidget in ConfirmBox

also make text in bottons configurable
test TextBoxWidget & new ConfirmBox in wtest.lua
本周末请优先实现TODO LIST 红色字体标出的三个项目。
deleting relocated files
Added support for query profiling (updates) in RangeServer
let user choose whether comments are open
描画クラスを追加。
非追跡ファイル拡張子を追加。
Some GUI bits.
Update annotation.notes

Nope.
adding mage card too
removed: Box2D tests for Pinhole Camera
removed: Box2D tests for Pinhole Camera

causes bug.
fixes for issue #18 demo.php out of date
tafriiii
SQL statement
sql version
Relocate failes
Anadida estructura inicial del programa
Made responsible design for all browser devices using bootstrap (better look and better fit for computers, tables and other devices)
removed blanck spaces
removed newlines
allow for full width pages
index.php sets default screen if no controller present
Merge branch 'dev' of git://github.com/openenergymonitor/emoncms3.git
Add client draft 76
forms added, but still problem with init of batch edit page
doc -l 0 to preserve whitespaces
less logging

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
CE Savior
Added the zoomify plugin and updated config to include
labelKeys
Update #5

Fix register.php
ready for testing, except grasp state
readability in error nessages isn't such a bad idea... Patch coming from SourceForge
build 12
Added some checks in OpenSSL\Crypt::decryptData and AbstractCrypt now uses gzdeflate instead of gzcompress
did some restructuring of tests
excluded bins
finished session One
finished the presidents array
Merge branch 'master' of github.com:jLukeC/president-game
Fix bug in sample data script
no .idea folder
some tpt++ simulation updates, randomly show either real motd or mine
Always creates a plane

I made it so when you import any .p file it will create a plane. This is
just a place holder until I write the actaul vertex data.
[Pacman] - Developpement

- Deuxième test affichage map qui fonctionne pas
  => j'ai changé toutes les coordonées des tableau (tab[j][i] en tab[i][j] car sinon ça ne collais pas avec la structure du tableau)
  => j'ai un affichage complètement raté à part quelques objets, je ne comprend pas du tout pourquoi. Peut être à cause du numéro de palette j'ai peut être pas compris à quoi il servait.
- Pacman peut se déplacer partout
MIFOS-5781: fixed 'Meeting Details' display
Updated composer.json for Behat 2.4.
Added a new entry into the TODO file.
Added versioning for querying of Sphinx tools.
Added version data to CMake modules.
Updated UI to reflect much needed changes to AdaptionUtility.
Enhanced work to incorporate majority of SphinxTrain's functions.
Drastic changes to session code, adding more functionality and stability.
Gave two sub-pages more access to the Adapt wizard.
A bit of editing of CMake, adding a global include to the build and removing QtGStreamer-needed flags.
Debuging of Domain Controllers, amendments to domain model. Added belongsTo static to application class.
Added Intiial implelmentation of power controller
fonts now in a plan css file
Modificando User para Admin
working state: ajaxlogin
search updates and :W mapping
add script to delete n3tau scores, since they were invalid due to bug.
Merge branch '0.7.0'
only accept minion key if create returns non-False
support for AWS regions through location option
support for AWS availability zones
minor method cleanup
support for setting login username
support for connecting via internal or external IP address
Stop ticking off Amazon
Merge pull request #18 from jbadigital/aws

Changes to AWS cloud config
10.04 deploy support
def location fix
fix incorrect minion file
Merge pull request #24 from deutsche/develop

Develop
Quick typo fix
Merge pull request #28 from techhat/master

Quick typo fix
Adding --version option to salt-cloud
Merge pull request #29 from techhat/master

Adding --version option to salt-cloud
Adding formatted output for -Q as per issue #19.
Merge pull request #30 from techhat/master

Adding formatted output for -Q as per issue #19.
Make version reporting a little cleaner
New upstream version 1.2.6
Fixed bug with scrolling dropmenu being loaded in wrong place.
Bulk of slides for FOWD JavaScript testing talk.
Calculates Levenshtein square and outputs HTML
Arregle problema de paginación en Objeto de Aprendizaje
Curso concluido
Added horizontal logo glyph.
Misc. minor cleanup.
Commit p2, p3
Add rst-tables
Use Q for @q
made them all square, 32x32
Merge branch 'updateNotificationAssets' of github.com:sneakyness/AppApp
Fixes the positioning bug in MKInfoPanel
add stretch form

git-svn-id: http://projects.conceptive.be/camelot/svn/trunk@2489 8325946a-aa55-0410-8760-f0bc8c33efaa
removed non-existing fields from PartyRelationship list display

git-svn-id: http://projects.conceptive.be/camelot/svn/trunk@2490 8325946a-aa55-0410-8760-f0bc8c33efaa
register programming errors when logging them

git-svn-id: http://projects.conceptive.be/camelot/svn/trunk@2491 8325946a-aa55-0410-8760-f0bc8c33efaa
Merge branch 'master' of gitorious.org:camelot/camelot
implement query attribute for Entities
Merge branch 'master' of gitorious.org:camelot/camelot into no-elixir
implement deffered attribute for Field
define inheritance using declarative
Update theme.php

updated to smarty3
added multilpe outcome analysis
up gradle
add stage
fix stage task
up gradlew vesion
Merge pull request #1 from jamesward/master

Fix for new Gradle version and gradle buildpack changes
fixed readme and license files installation
Changed attributiong for Base64 library
use postgres locally on OSX 10.7
Updating series data querying and display
tweak toc width
relative dates
layout tweek, separated out stylesheets
homepage copy and header colors
tweaked copy
Fixed simgear static linking, further arduino work.
Small view tweak
Small view tweak
isEquivalent commit
need to fix
New file structure ios sdk
New file structure ios sdk
Merge branch 'plivesey'

Conflicts:
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleAPIURLFactory.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleAPIURLFactory.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/CreateUserOperation.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/CreateUserOperation.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/GetPuzzleOperation.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/GetPuzzleOperation.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/PuzzleOperation.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/PuzzleOperation.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/PuzzleOperationManager.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/PuzzleOperations/PuzzleOperationManager.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/Vendor/JSONKit.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Private/Vendor/JSONKit.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/Puzzle Models/PuzzleUser.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/Puzzle Models/PuzzleUser.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleAPIKey.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleErrorHandler.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleErrorHandler.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleSDK.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleSDK.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/Sample App/MainViewController.h
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/Sample App/MainViewController.m
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/Sample App/MainViewController.xib
Updated git ignore
operations updated:
Merge remote-tracking branch 'origin' into jtilley

Conflicts:
	SDKs/ios/PuzzleSDK/PuzzleSDK/AppDelegate.m
Added the rest of V1 operations to IOS SDK.
added new operations
Created chess tactics product. Started coding.
First draft of create tactic in product.
Login API changed to match Google Docs.
Python test scripts written
Merge branch 'master', remote-tracking branch 'origin' into jtilley
Merge branch 'jtilley', remote-tracking branch 'origin'
Progressing on Java SDK. Fixing little bugs on the user testing
side such as checking for authentication token.

Still have the initial checking of API token in the request
header commented out -- should be a quick change to integrate.
Merge branch 'master' of http://github.com/jimZhenG/Puzzling.com
"name" parameter changed to "username" for login process
Java SDK progressing with JUnit tests passing.
Created errors.js / defaults.js to keep track of server code.
Some further work on chess tactics product. Mostly on create puzzle - adding features and cleaning up the flow.
Merge branch 'master' into plivesey
fixing memory leaks in puzzle operations, added puzzle object
added error message if saml decode fails
error message goes to logger
renamed to make a bit more sense
Update MahApps.Metro/Styles/Controls.TabControl.xaml

Add AdornerDecorator to each tab in a tabcontrol
Fix binding to content in previous commit
Update MahApps.Metro/Styles/Controls.TextBox.xaml

Fixes "validationTooltip not found in scope" error when focusing on invalid textbox
Merge pull request #189 from rbev/master

Add an AdornerDecorator to the tabitem template
scroll via scrollwheel
Fixed #199: Checkbox and Radiobutton now have a single tabstop
Fixed #197: Orange accent now in the ThemeManager defaults and available in the demo app
Pivot now has a SelectedIndex property that can work from a viewmodel
Backing out some of the code from #189 - the validation/adorner layer breaks other parts of databound controls.
Merge branch 'master' of git://github.com/MahApps/MahApps.Metro

Conflicts:
	MahApps.Metro/ThemeManager.cs
Fixed some bugs with things.
added adjectives and nouns to the admin page
Renaming to match repo name
Updating projects and namespaces to new name
Altering output target
Update SublimePeek.py

Tweak to show in chrome application window
Fixed wrong hours
unify use of bootstrap macro in make files
fix build for wgml project on 64-bit Windows
renderpngdummy testing
Added a help link.
Added short description.
Tweak interesting expression analysis.
Better handling of loop constructs so we show the condition being evaluated each time. Implement handling of repeat.
VP Recherchee
Implement that copy dict file to ~/.chewing
Update README.md

added a link to a nice write up on meteor Fundamentals and Best Practices
Add Tim O'Reilly tweet
Changed from server config attributr to add operation
Added comment links to /top and /show, also fixed /user links
Fix box filter

The result is corrrect until the box filter stage

However,
the result of G.E. is different with the brutal force
calculated result in MATLAB (only) at the edge, this
is a bug or owing to the presision of float point?
Change setStrict to setStrictMode
Setting powermock dependency according to openmrs "Mock Doc"
Set timeout and attempts
moved stuff about
made static
Testing PID stuff, made good progress
Support variable arguments and reduce the dependency on json encoding.
Fix bug in using mutable class variable as instance variable.
Add server-side lua script for clearing messages.
I never use command-t anyway
BUG: fix refactoring bugs in nonlinearls
Added CLI flag for setting the GM's email address
Site updated at 2012-04-10 15:49:56 UTC
nothing
nothing
Merge branch 'master' of https://github.com/jpope19/GatorAirlines
background
Merge branch 'master' of https://github.com/jpope19/GatorAirlines
MycoRegNet data parsed into R
Change LGTM message to "passes tests"
Ignore any problems with unicode characters in issue titles.
Removed links on home page (for now), and added 'Coming Soon'
Remove console selection (Issue #17) - Part II (Settings & Code)
Add nav class partial
Update _posts/getting-started-with-poet.md

show the entire code sample and change rendered jade file from 'post' to 'index'
Merge pull request #1 from oren/master

correct jade file to render
Avoid registering same position multiple times
Format dates and months with 2 digits
use the new 30 seconds pongout
getLimitString() now uses 'OFFSET' text to specify the offset instead of a comma. Also, added 'ILIKE' comparison operator constant. Both changes are for better PostgreSQL compatibility.
Rebuilt docs.
Rebranding start
Invite touchups
Juan Carlos

Actualizado
conf de bbdd separada para prod y dev
corrijo ruta de listado de venues
Fix org-mode compatibility.
generic deploy message
ok
readme
Fixed binding removal during view.
Adding unicode methods for location model
Fixing urls and adding location to view
Styling up the location pages a little bit
created a user model
validations
validations
Tweaked comment for correctness
Add average speed to scan display
version bump to 0.8.1
fixed up some urls
Change 'allowed_grid' to 'allowed_grids' and allow it to be filtered.
Add some extra filter hooks to allow for some flexibility.
Add support for the columns.min.css file.
Move stylesheet files to the CSS folder.
Some useful hooks for changing up things.
Make sure MigrationManagers always get Unicode names.

If we fail to do this, SQLAlchemy complains that we're binding a
non-Unicode value to a Unicode column.
Level exits are Unicode too.
Prevent non-Unicode SQLAlchemy warnings in most submission tests.

This commit  makes test_submission mostly warning-clean.
Fix docstring typo.
More Unicode titles to prevent non-Unicode SQLAlchemy warnings.
Prevent SQLAlchemy non-Unicode warnings in this test.
Prevent SQLAlchemy non-Unicode warnings from this test.
Make filestorage available to code that only imports storage.

The storage-related tests were relying on this, if nothing else.
Don't rely on app_config if common.TESTS_ENABLED.

app_config will be None in this case, so all of these subscripts will
fail.
Drop our scoped session sooner to prevent SQLAlchemy re-binding warnings.
Merge branch 'master' into 201207-testfixes
Minor improvements to the processing panel

- It is now possible to actually see what's processing, due to a bug fix
  where __getitem__ was called on the db model.
- Removed DEPRECATED message from the docstring, it wasn't true.
Panel improvements

- Added progress meter for video and audio media types.
- Changed the __repr__ method of a MediaEntry to display a bit more
  useful explanation.
- Added a new MediaEntry.state, 'processing', which means that the task
  is running the processor on the item currently.
- Fixed some PEP8 issues in user_pages/views.py
- Fixed the ATOM TAG URI to show the correct year.
Processing panel improvements

- Added admin processing panel
- Minor fixes on the user processing panel template
removed _make_safe in favor of functools.wraps
Early version of theme registry code
Themes are now registered and can have their templates loaded properly
Moving staticdirect to tools/
Kill MultiRemoteStaticDirect... nobody was really using it anyway

Since we're adding the new "domain" staticdirect system we should
clean this up.
Update staticdirect stuff so it can handle "domains" of staticdirection
Problem with json parse
Update README.md

Notes:  

1.) install-nagacti-ubuntu has been tested on Ubuntu 12.04 LTS and it works as follows:
    a.)  First:   it uses synaptics to fetch nagios, cacti, nmap, dependencies, tools, and plugins 
    b.)  Second:  it extracts the embedded shar archive attachment contents from the end of the script to the root directory which contains nagios/cacti/plugins/discovery tools preconfiguration files and their helper scripts
    c.)  Third:   it does any post-extract manipulation to the shar archive contents (chmods/chowns/seds/etc.)

2.) The original shar archive was built by running "find . -type f -print | shar -S -o ../staged-configurations.shar" from a directory which had a "fullpath" copy of desired systempath config files

3.) when editing the script, make sure you know if you need to edit the "pre-extract" logic, the "post-extract" logic, or the shar contents.  If you edit the shar archive, make sure you remove any specific references to content which it expects to be extracted  in the post extract logic of the parent script
setup files

Signed-off-by: Ka-Chun Chau <kachun@kachunchau.com>
Adding work page.
Adding portfolio page.
Add gitignore
Merge branch 'master' of github.com:kaihualiu/TimeBrowser
fwr: code review updates

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@91621 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
def: 6085 fixed retrieving by pk with an empty value

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@92084 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
sad/happy face are gone
Use CURLFTPSession's new directory enumeration API to build up our custom dictionaries.
added WebDAV variant to MockServer where PUT fails
synchronous js and inline js
Pixel/em/pt values validation added.
fix quickdrop animation
Add pause capability
Merge branch 'pause'
fixed resizing on pause

Also refacored some common code
Merge branch 'pause'
Renamed file with symlink.
Added mysql path.
more asset pipeline moves
navbar and footer
Merge branch 'release/0.1.2' into develop
adding phone extensions to vendors
bump da version
Merge branch 'release/0.1.3'
bump da version
Merge branch 'release/0.2.111' into develop
fix uncaught exception
unify exception class in two projects, common and trade-bot
Adding compilation, immediate mode, and error handling.
Make OAuth handle less-common body data better.

Related to Issue #910. Specifically, OAuth won't sign the request unless
it gets a body type that is urlencoded or multipart. This is overly
restrictive. The correct behaviour is to sign the message without
including the body as part of the signature.
Merge pull request #956 from Lukasa/issue910

Try to resolve OAuth+JSON problems.
redirects clear files also 

Fixes #575
remove chardet
update docs
upgrade plan + downgrade plan + invalid payment handle implemented
backbone setup
users list ok
users's issues
update ui
backbone setup
users list ok
users's issues
update ui
Merge branch 'users-issues' into dev
Merge branch 'irc' into dev
setup irc
Merge branch 'users-issues' of github.com:kernicPanel/skproject into users-issues
real redmine ids + clean mongo schema usage
issues by user and by project
Merge branch 'users-issues' into dev
fichier d'exemple
Merge branch 'dev' of github.com:kernicPanel/skproject into dev
activation du bot dans l'appli + connexion au bot irc
Report draft and results of tests
Implemented a simple transaction mechanism. On commits inserts/updates
are triggered. Simple row level locking.
protobuilder.h: provide for constructors from pointer that take other args
Script to test under valgrind
Wrap FunctionPassManager, ExecutionEngine, use FFI for JIT fns
Fix for terrasar-x descending, and dual-pol.
second pass, synchronous diffusing computation with asynchronous mpi calls.  Will fail if knot/cycle is present -- otherwise ok
add validation on forms
powerslide: add scsi command output
[Typo Correction in doc/big-idea]

    -    Replaced BlobID by Hash
Forgot to add the matrix_mod module to the git repo.
added support to decode type 4A groups (date + time)
poprawione bugi w dynamice reptation
nl80211: merging with mainline linux 3.0.36 from kernel.org
util for showing running threads
update host information
Adjust change listener interface

-   Content changes are now range changes.
-   Property changes are now a mixin, included in all collections.
-   All mixins now have a constructor and prototype.
-   Lists no longer implement range change notifications since they cannot
    produce a proper index, suitable for mirroring those changes on another
    collection.
-   Replace add each content change with mapped change.
-   Redocumented change listeners.
Fix position of spinbuttons at ClientSettings and ServerSettings
Fix browsing through the options in ServerSettings and tv settings
Fix list icons in TV/RadioGuideSearch + added genre
Fix 64-bit on Windows, possibly fix crash on iOS, and possibly fix needlessly recreating the graphics device
Update Libs and remove submodule ignore... how else do we add changes?
Merge remote-tracking branch 'origin/develop3d' into develop3d

Conflicts:
	MonoGame.Framework/MonoGame.Framework.Windows.csproj
Suspends update/draw when iOS apps go inactive.

Address issue #397
Fixes a problem initializing components under certain circumstances.

Any component added before base.Initialize is called in a Game
implementation might never be initialized or drawn.  This includes
components that are added by other components in their Initialize
method.
Merge pull request #403 from kungfubanana/ios_suspend_3d

develop3d - Suspends update/draw when iOS apps go inactive.
Merge pull request #405 from kungfubanana/component_init_fix3d

develop3d - Fixes a problem initializing components under certain circumstances.
Fix graphics on windows/linux, hopefully
Merge pull request #409 from espes/develop3d

Develop3d: Fix tests and graphics on Linux+Windows
Added the files because I'm stupid
wish id been awake enough to do this bit last night!!!
looking a lot better
ホイール変更、メニュー無効化
Made some renaming.
remove theme specific files
add project folder to gitignore
remove project file
Merge branch 'gh-pages'
git ignore database yml
a
quick song completion check fix
https://github.com/daid/Cura/issues/37 package.sh does not run correctly when current directory is not script directory
Revert "it's is so hot than svn you konw!"

This reverts commit 3354184286dcc92e158ca9c7a84025946fffc455.
goagent
new
Added to the FingerPrint:

 - added magic to detect file type
 - created blotter module (given a list of files blotter create a swirl into memory)
 - created unit test to test blotter

TODO
 - scripts/fingerprint is broken
updated architecture from dropbox
Merge branch 'master' of https://github.com/lcr2131/HardwareFinal
merge
fix posix api
fix ifdef macro in gc
remove debug code
Merge branch 'master' into m
merge
fix
Merge pull request #232 from wakama2/work_concgc

implement concurrent gc
fix Array.map() and Array.inject()
Merge pull request #242 from nikuuchi/filter

fix Array.map() and Array.inject()
Merge branch 'master' into work
add fault_injector
readme
changed to node 0.7 for heroku
package.json fixed
Routing fixes for heroku
Mudança de projeto para o projeto de lista de jogos
fixing namespaces; VisualStudio still remains
added a longer summary to README
ask
Merge branch 'master' of https://github.com/lifang/gankao_season3
massive changes to tests.scm
Don't return spurious success from HashTable_Del on not found
Split slot spinlock.  Bump TI-RPC version.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
wow, did this all in one day..
Rename "Code Pasty" to "CodePasty". Fixes #15
#17 support for named pointcuts was added
Update lib/resty/http.lua

fix Content-Length error
Documentation: Adding some info about the draft field.
create teacher directory
Very easy - I've improved since '06
write editable elements back into YAML (FS writer) + replace content assets in both pages and content entries (API reader) + fixed broken tests suite
More updates to observations.
More updates to observations.
a bit of wrong doc corrected
Specify that the bitboard is shifted by an unsigned 64 bit int.
Use new enum types for rank and file.
Remove previous POSBOARD declaration.
Move enums into alphabetical order.
Add BitBoard stringer.
Missing ; and extra ) removed.
added slider styles again
editar arxius remots desde sublime
lets por let's
Removed useless kdtree table & add a comment
updated grammar for optionals
Fix string faces for Isabelle
Use expand-file-name instead of concat
Setup programming configuration in proof modes
Move whitespace-mode configuration utils into library
Merge branch 'master' into lunaryorn

* master:
  Move whitespace-mode configuration utils into library
Fix feature dependency

Proof mode is defined in proof-script.
Do not highlight overlong lines in proof modes

Due to unicode overlays the actual lines can be much longer than 80
characters, but the visual lines are quite short.  Hence disable the
irritating highlighting of overlong lines.
Ordena Lista
Merge remote-tracking branch 'origin/master'
[asan] increase max stack size to 256 (+test)

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163308 91177308-0d34-0410-b5e6-96231b3b80d8
Use the return value of dladdr() to avoid Clang warning.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163311 91177308-0d34-0410-b5e6-96231b3b80d8
[asan] Use __ANDROID__ guard in asan_test.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163313 91177308-0d34-0410-b5e6-96231b3b80d8
Fix two compiler warnings: must use at least one argument for "..." in a variadic macros, signed vs. unsigned comparison.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163314 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: fix Go build script


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163320 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: increase max shadow stack size + reduce memory consumption at the same time (by not memorizing full stacks in traces)


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163322 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: fix code style


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163326 91177308-0d34-0410-b5e6-96231b3b80d8
[Sanitizer] add --demangle option to llvm-symbolizer (for now just assume that __cxa_demangle option is available)

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163376 91177308-0d34-0410-b5e6-96231b3b80d8
[ASan] add Linux-specific test for initialization order that checks that we find a bug independently of translation units order

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163379 91177308-0d34-0410-b5e6-96231b3b80d8
[ASan] hack initialization-bug test so that it stably passes on both Linux and Mac: make the bug appear independent of the translation unit order

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163381 91177308-0d34-0410-b5e6-96231b3b80d8
add license and contrib blurb
Add line A in file4
Set correct branch for travis ci.
Adding more indexes to db and updating bounced mail receiver code.
...prepare to testing cluster
simple sharding tested
tests for composit pk
fiber shards tests
add support for multiple messages in one data chunk
Schema system overhaul: split into multiple funcs.
lpc to flare script will now pack the sprite as well
v.152
Added instance stealing mode property.
Added test patches.
no rescue error
tagging mana-20121120-000
[s2464] Remove script for npc 4968. Will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit ccf6901)
[s2603] Drop script support for Vectus - Scholomance.

The boss script is already included in the latest ACID. Also the event can be handled by gameobject or spell script.
allow cuts to be saved as workspaces by out=data.cutE()
Merge branch 'arrow_fix'

Conflicts:
	lib/guard/haml.rb
	spec/guard/haml_spec.rb
Merge branch 'development' of git://github.com/manufaktor/guard-haml

Conflicts:
	spec/guard/haml_spec.rb
Fix multiple output params (fixes bug in request #8)
Merge pull request #15 from jamesgary/master

Fix bug in multiple `output` params
update code
update badge engine
merge mannix code sep-28-12
remove blank line before php tab
will this work?
Minor changes. Testing still required
Removing syntastic

Removing syntastic for better performance and windows support.
Merge branch 'master' of git://github.com/marcin-wosinek/dotvim
made the Recaptcha Plugin behave like the other plugins, which show content, meaning do not call directly, but replace a <!-- plugin:recaptcha --> tag instead
Merge branch 'master' of github.com:marcoraddatz/candyCMS
added resend controller action
fixing bug in sendAdminMail
made saving mail to queue optional
- completata form fax
- manca inserimento in userXML
REFACTORING
1. fixed friendslist ftl to include friendslist not frienshiplist
2. random email generator in functionaltest
Add layout

Change-Id: I48a459634aebe22836dd1d8b1fa8690ff56a7b3d
Add redirect to public

Change-Id: I9900fd1fa2b97d9c694bc008f00e21d417f36e96
[zshrc] added zsh-syntax-highlighting plugin, added RVM
[new] added .gemrc
Improve adapter support, allow markup to be provided
Tweaking the colouring of the default border, to better match the
ubuntu theme.
s/inval/intval/. props PeteMall. see #14889.



git-svn-id: http://core.svn.wordpress.org/trunk@21168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Don't pass action ID to the ajax actions to avoid possible back compat problems. Props sivel. fixes #20699

git-svn-id: http://core.svn.wordpress.org/trunk@20857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Refine early bailing checks in customize.php. see #20852.

git-svn-id: http://core.svn.wordpress.org/trunk@20858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove the Ryan Boren Comedy Script from the POT file.



git-svn-id: http://core.svn.wordpress.org/trunk@20722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Disable multisite quotas by default on new installs. props mpvanwinkle77. fixes #21513.



git-svn-id: http://core.svn.wordpress.org/trunk@21827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
finished interpreter chapter
modified minion_auto_puppet overlay, more minimal, data center tested with ESXi 5 VMs and different puppetmaster/agent VLANs! added more information to puppetlabs seed
Cleannng the code and renaming the parameters, functions to follow the librray standards
Getting the gpu_id connected to the default xscreen
Add hook for SearchFacet view override
checking to not allow ourselves to friend ourselves
added aliases for zshrc
added AtomicCount_Win64
formulario inicial

se agregaron funcioanlidades nuevas
inverting an axis shouldn't affect the autoscaling setting
Renamed all instances of variables named "long" to "lon" to avoid clobbering by 2to3
Remove NO_DEPRECATED flag -- this was accidentally committed.
Added a test for #1553
Merge pull request #1557 from WeatherGod/invert_autoscale

inverting an axis shouldn't affect the autoscaling setting
RF: refactor installation checks to check scripts

Rewrite of testers module for clarity, in part.  Add a routine that
allows us to check if any scripts have been missed in the installation.
Add this to the Makefile as a target and to the release checklist.
DOC: add/expand docstrings, move code for testers
RF: add informative message when check-files is OK

Also return something that could be used as an error code.
RF: refactor, rename nifti diagnostic script

Script didn't have any usage, help, etc.  Stolen from nib-ls.  Renamed
to nib-nifti-dx to fit with our new naming scheme.
BF: add missing scripts to setup.py

We were missing the dicomfs and nifti diagnostic scripts.
Added in a primitive way to tesselate a wall.
The room is now 50% bigger.
PKGBUILD: make cloning of the git repo a little faster (download less history, no branches, no tags).
was failing one test because of removed #javascripts folder
Handle overlay filesystem lifecycle.

It is reasonable to expect that the overlay filesystem will be managed.
readme incial agregado
xboard parser: added comma in regexp for name command
Remove commented code.
Add check to make sure local git is synced with remote.
dynamic samples load
samples load error handling
Fixes for content-assist code
Correct error with pre-processor expansion of empty macro (`)
electric pair mode causing some issues
Add dependency on scss-mode
Hook modifications for programming
Commentted the track initialization to prevent any future overloading of the database.
added stats api functionality
Merge branch 'master' of github.com:mcclaskc/statsmix_jar
Sync green theme with light
Matching style for notifications for a-mego theme
runner: Always select the command first and don't match directories

https://github.com/Razor-qt/razor-qt/commit/0f0168946dd31e73cd#L0R140
Minor fixes
Merge remote-tracking branch 'upstream/master'
Sync Updating with oficial razorqt git
755 on init.d/nginx
another response.stream update in ch. 4
Fix showing reviews within the library when Amazon reviews are disabled.
customize alayyam project
add dummy databse cookbook which installs mysql-server-5.5
add nginx website configuration
#525742 minor changes
AbstractIoConnection Unit tests
by micahw156: Updated README.txt file again to make it more readable.
Reader extensions for Joda Time types
Explain that Cheshire or clojure.data.json now need to be added as explicit app dependencies
some restructuring as I see currently neccessary to work on this

Note this is not tested with the build script so the build _will_ probably
fail. Nevertheless the structure needs to be a lot clearer in order to work
efficiently on chapters.
Moved a couple of utility methods to new superclass (which makes the unit test class slightly shorter).
Split unit test class into two files to better separate testing of different functionality. Also made three tests a little bit more comprehensive.
Merge remote-tracking branch 'origin/master'
Add main file
Revert "Add main file"

This reverts commit cd3334bd94e2b97526e7f13560866c66f6ba03c2.
Add main file again
Work oon Synapse Library
Fixed interactive pylab with units. Added synapse library summariser
Work on Synaptic Template hierachy
Work on new summarisiers
Renamed membranemechanisms to channels
More refactoring out of the 'membranemechanism' into channel
PreSynapticMechanism -> SynapticTrigger
More refactoring out of PreSynapticMechanism
Move peak_conductance into the post_synaptic mechanism
More refactoring worg work
Some improvements on bash scripts

Added "vars.sh" script, with all variables for all bash scripts.
And some updates in others scripts (shebang, bug corrections, improvements, etc…).
Added : Disks check for Debian/Ubuntu

Now, with "df" command line, we can check disks capacities.
Corrected : centralreport_debian.sh script
Corrected : auto_install.sh : Error when determining Python version.
CommonBundle
album CRUD
added font used by code52 called Segoe UI Light
Added MANIFEST.in and proper package_data installation
Damn swap file...
Remove (no-)bundled-celt option.
Output Chef version
Add a deeper check for ssh connectivity before bootstrapping
fixed require for libcurl
Added Shaghal.com, my current project, to the welcome page
Balaji/Sanjana | bug fixes on schedules
Ashok, Ashish | #1961 | Refactored obd publisher and handler to serve inbox call details also
[sync] more content on storage formats listing

included links to old formats on wiki
Clean up.
[sync] storage format 6 details
Merge remote-tracking branch 'origin/gps/sync-refactor' into gps/sync-refactor
[sync] roll cryptography page into storage format 5
[sync] fix ReST warning
Merge branch 'gps/sync-refactor'
Change em:unpack warning message. (bug 705551)
Add rust-opencl to packages.json
Merge pull request #21 from luqmana/patch-1

Add rust-opencl to packages.json
provide callback for tests
test loading manifest via XHR
JASPER # 001 # 01 : post terminal renamings
JASPER # 001 # 01 : initial version for stage 001:01
JASPER # 001 # 01 : terminal for stage 01
use strtok_r() while splitting target name list.
Fix #5 by forcing everything into the labelLookupTable

I toyed around with getting it right in the main loop, but it turned out
to be way easier to fix when creating the labelLookupTable.
update invite link
require authorization
Corrections of orthographics faults in it-values
Added lj_archive.sh to repository
30 oct
populator
ads for client and user added
move some dotfiles to 'home' directory
Trees++: remove signblock crafting recipe so can be added as sign item in ExphcTweaks - part of fix for https://github.com/mushroomhostage/exphc/issues/89
fixed test.py
Signe-off-by: Mykola Yaremov <n.yaremov@gmail.com>
debug  proxy mocking in appliation operation tests
autocomplete for search
merge
add text color to body (popup text was white on white)
archive messages can't sensible be used for creation, so hide radio button in archive list
remove radio buttons entirely from archive messages; remove pointer on mouseover of things you can't usefully click
custom MM help text depending on whether or not this is a creation page or just a report-viewing page
provide link to DPS map (currently on 'all reports' page)
JS lint fix
Text changes from Bromley, fix bug where multiple Title fields would appear if pin moved.
Added better image to tile accross the top border, now it works in safari/ff too...
Fix low IE filter URLs.
No need to require fonts for stay.py.
Refactoring sprite drawing.

Sprite drawing is done for new sprites by a new method `draw`;
If it's available, the Group class uses it, otherwise it blits
as usual.

As part of this, the handling of the `visible` attribute is
now handled in `Sprite.draw`.
New AggregatedSprite class.

The AggregatedSprite class extends the Sprite class to
hold a list of other sprites which could be manipulated
together.

This is still a work in progress
Adding a new 'attack' demo.

This demo will demonstrate the AggregatedSprite capabilities.
Using the property() method instead of @ annotations.
Adding `visible` as another property.
Simplifying _get_scale().
Adding _visual_att wrapper for peroperty setters.

For now, we use it to mark the sprite as 'dirty'.
Idea taken from: http://stackoverflow.com/a/5186698/107085
Correcting 'image' proprety docstring.
Renaming _visual_att => _visual_set
Adding on_visual_set callback option.
AggregatedSprite is smart now.

It uses the property() notation, but more importantly,
it uses the new on_visual_set event to propagate visual
changes to all of the child sprites.
Attack demo now demonstrates scale, rotate, visibility too.
Fixing bug in AggregatedSprite's visibility handling.
Cambiando nombre del proyecto
Add the PackageManager example.
try out andrew's scale advice
does this show on the first heroku app
Ensure a user is a paid minecraft member before allowing registration.
Move all alarm db access to AlarmPreferenceDao.
Add TaskType and TaskTypeDao.
Activate TaskTypeDao.
Replace categories with task types. So we don't group task by categories any more.
Merge branch 'master' of github.com:nbeloglazov/GeekAlarm
Site updated at 2012-10-02 22:12:48 UTC
ignore .pdf for now
Automated benchmark execution
move ruby lib
fixed misnamed variable
added voting and bopping
Merge pull request #73 from mcmoyer/master

voting and bopping function
Added setInterval for Python (threading.Timer)
Added self to the updatePresTmr function.
Added another self that was left out. (updatePresTmr -> self.updatePresTmr)
Left out one more self (updatePresTmr() -> self.updatePresTmr())
Merge pull request #77 from lemonsourkid/master

setInterval for Python (threading.Timer)
Avoid throwing an exception if the server responds improperly.
Added blocked parameter for snagging.
Added blocked parameter for JS version
Merge pull request #79 from lemonsourkid/master

Fixing Snags
bump version
Changed all isinstance(xxx, str) to isinstance(xxx, basestring)
Merge pull request #80 from lemonsourkid/master

Python: Changing isinstance str to basestring
Added remDJ method, will add others later
Added several new methods
More fixes!
Merge pull request #82 from paradox460/master

Finished a handful of TODOs
summary linking working
integrate rmi to cli, use policy
remove debug logging
make rmi configurable for driver
merge torque node manager changes (exception)
Update README with express 3 usage (typo fix)
Merge pull request #35 from MarioLinden/master

Update README with express 3 usage (typo fix)
Implemented rAF

So much smoother!!
add git prompt back into my PS1
sat. morning home backup
fix inspect method
add private tag and spaces
force to generate new application java file
a temporary patch to fix testrtt page, but master server should be able to
actually execute testrtt
set email to not nil value
Better permissions handling
added USB check for wifi, not just interface check
Tweaks to setup script
Add 'wifi/' from commit '7c48fb9164f4c80cc98dcb3fa4e0f23d39b2d0b2'

git-subtree-dir: wifi
git-subtree-mainline: a57c30f2e6aeaa9772c5de537518e25b90a0165e
git-subtree-split: 7c48fb9164f4c80cc98dcb3fa4e0f23d39b2d0b2
Handle official movie.
nan behavior differ on Rackhub
.gitignore
tweak
Note that Python 2.6 and 2.7 are supported
Add Tox support for running tests in multiple envs

Tox (http://tox.testrun.org/) is a tool for running tests in multiple
virtualenvs. This configuration file will run the test suite on all
supported Python versions. To use it, "pip install tox" and then run
"tox" from this directory.
Note that tox reports failures w/ lettuce 0.2.5
Einfaches Template für Latex-Artikel
Fixed issue with creating new pages.
More work on PokerMaster, still not usable
cleared up a few instances of bad spelling/grammar
Moved default attributes to the attributes section.
Moved the RVM notes ignore step; added a comment about ignoring any errors in the output.
Better general handling of complete frames
First Flask implementation
Bugfix:  Mimics were prevented from revealing themselves on wilderness levels.

Signed-off-by: nppangband <nppangbanddev@verizon.net>
Bring in a rudimentary dist.ini for Dist::Zilla.

This addresses #3.
Use Dist::Zilla::Plugin::PerlTidy.
Clean up dist.ini a bit, change filenames around.
Add a reference to .perlcriticrc.
Tighten up some dzilification.

Add a VERSION comment to Concise.pm to satisfy `dzil xtest` and its complaining.
Move to use README.pod as the canonical source of documentation.
Change the major version to 0 in dist.ini.
Do not track MANIFEST in the source control repository since it is generated now.
Do not track MANIFEST.
Clean up VERSION wankery, remove old Module::Build Build.PL.
Version 0.9!

Basics in place.  Lots of room for styling, but the essentials are there.
added map stuff on my_info page
A correction for the disk image file name.
Add part about goal ordering in solutions.tex

Signed-off-by: Niels Thykier <niels@thykier.net>
gittest: goodbasic
gittest: deleted basic
add basic
Fixing spelling error (s/upppercased/uppercased/)
Logo updates and new team pages
Added --raw to default arguments.  Restructured mysql command line argument assembly.
Merge branch 'test' into prod
�dlk�sdkf
[#2,mapping,test][s]: fix bug with mapping_update (bug in _request method), implement mapping method.

* Also refactor tests to use local elasticsearch.
[refactor][s]: replace print with logger.
Signed-off-by: okkam1 <okkam1@hotmail.com>
add tree animation
Revert "Revert "Revert "Revert "Revert "4kaime"""""

This reverts commit 5af5aa651d609bb78ebdd143f62ed227ab545d64.
Revert "Revert "Revert "Revert "4kaime""""

This reverts commit 502dee7784bf2b6f9fba75ad0e4c3737cf393b82.
Revert "Revert "Revert "Revert "Revert "4kaime"""""

This reverts commit 2fab44fa02b665e0d89b4de41d613f4482f9440c.
Revert "Revert "Revert "Revert "Revert "Revert "4kaime""""""

This reverts commit a9a912e34439f5461a71f2327908752c9ec689ac.
Revert "Revert "Revert "Revert "Revert "4kaime"""""

This reverts commit 5af5aa651d609bb78ebdd143f62ed227ab545d64.
Revert "Revert "Revert "Revert "4kaime""""

This reverts commit 502dee7784bf2b6f9fba75ad0e4c3737cf393b82.
Clear divs after files list on items/show
Allow non-superusers to use this extension. No API changes, just need to add role credentials to a new table
Updated README
Update README
more robust create_deployment signature
Merge pull request #175 from ifreecarve/2012-07-20_create_deployment

more robust create_deployment signature
renaming of methods as per MM
Merge pull request #243 from ifreecarve/2012-11-26_agent_save_restore

renaming of agent state save/restore methods as per MM
[OPENENGSB-3408] remove hardcoded paths from poms
correct some more dependency versions
Replace notation with zsh scientific notation
add moisture sensor component
grove light sensor component
wiki link in grove temperature
add extra info in introspect