labofsahil/github-event-dataset-2012 huggingface dataset:
Make output more verbose
Fix route IP check problem

The IP check used to assign the route's mask to the
global destination IP. Change to copy it before doing so.
modification de cette directive pour créer le rep sur Heroku

Signed-off-by: Issam Hammi <hammi.issam@gmail.com>
Started some perldoc for Dancer plugin. #gklst
KDE link fix
Added kde core module
Do not add form_ prefix to the form ID
Merge pull request #8 from aschempp/patch-3

Do not add form_ prefix to the form ID
Removed debug form.
Add another layer of resiliance to test for #24
replacing PKI token detection from content length to content prefix. (bug 1060389)
raedwulf's initial commit
contact page!
Updated rake tasks and docs. Removed obselete spec.
admin-data-for-production
überflüssigen Text aus Heapaufgabe entfernt
renamed domain => host overrides
add uname.cs. renew \$PATH
Initial commit
Add Windows and Windows debugging support
Added new.rb
BPM slider works
Вынес ChunkBuilder, исправил отправку потока (поток теперь не обязательно файловый)
Check version before testing BITOP/BITCOUNT
Whitespace
example/beta.sh
Add clear file mapping
added more info to package.json
Merge pull request #15 from caolan/master

Added more info to package.json
Tinkering with settings to get better swarming behavior. Reworked applyBoundary function.
put rwec account infrastructure into place
Add a direkt method to get particles of a ParticleContainer, add comment and refactor
Changed ParticleContainerTest to an abstract class, add implementations new ParticleContainer interface and add subclasses  for SimpleParticleContainer and LinkedListParticleContainer
Refactor and improve comments and logging
Change configuration files
made some progress updating from js version
done bitmapanimation and graphics
aded graphics shadow and domelement
done spritesheet and utils
added text
added mouseevent
Proyecto funcionando con todo y llaves primarias en la tabla
miller-rabin: use uintmax_t
Added comment, removed unused import
added mgen tool
Heavy code modification to reflect changes in bson package!
Version relaxation of several packages.
basic modelling
first release of the code
Merge branch 'master' of https://github.com/roccodm/cnv2db
add blockerState
html > jade
changed all httr functions to RCurl functions
Merge pull request #8 from ropensci/withrcurl

changed all httr functions to RCurl functions
updated .Rd files for those fxns modified in the last commit
Added new package option 'humanomni25_8v1a' to validCdfNames()
Added: rtSocial to plugins support
Resolved: Upgrade Theme Notice and Version Issues
implement doubling test to check ratio
Fixed minor defects. Final commit

Work version deployed on http://rot13algorithm.appspot.com/unit2/rot13
cosmetics --help, use DT instead of DATE as arg info for "date time"

Now there 2 spaces more which "fixes" the ugly man page (help2man vs.
gengetopt ...).
using parking api
Update Ruhoh setup routine for command-line client.
Correctly handle absolute urls for javascripts and stylesheets.
added nodejs.org.au domain for jitsu
MDL-34563 accessibility compliance for data module: Add forform input text and select tag
change to plural strings
MDL-31987 Assignment module: Assignment count submissions correctly
For advanced upload assignment, store file count of each submission
into assignment_submissions.numfiles

When counting submissions, if the assignment is open and tracking
drafts, only submissions which has send for marking are counted.
Otherwise, submissions which has numfiles > 0 are counted.

Also change a hardcoded 'submitted' to ASSIGNMENT_STATUS_SUBMITTED.

This patch was originally written by: Sunner Sun <sunner@gmail.com>.

I made some modifation to fixed count_real_submissions() query (ref: MDL-32207) in /mod/assignment/type/upload/assignment.class.php file
API: Instances index, show, and entrypoint
API: Show full representation of instances in top level collections
Removed use of locals in show action
Switched to Inconsolata because its prettier on a retina screen ;)
Properly change user and group for `runas`. Fixes #1959.

Previously, in order to run a command when `shell`'ing out, we relied on `su`. At some weird times, `su` failed to do it's job. Now, we rely on the fact that `subprocess.Popen` accepts an argument `preexec_fn` which is a "callable object, this object will be called in the child process just before the child is executed", which is where we change the user and/or group.
Properly handle not being able to change user/group. Refs #1959.
Fix PyLint C0103 on `salt.modules.openbsdpkg`. Refs #1775.
Fix PyLint C0103 on `salt.modules.augeas_cfg`. Refs #1775.
Fix PyLint C0103 on `salt.modules.pecl`. Refs #1775.
Replaced OS environ checks with `salt.utils.is_windows()`.
Added license and talk content
Fix typos in configuration templates
Merge pull request #1425 from baijum/config_typos

Fix typos in configuration templates
set spell in vim needs more [ power
Start on test docs, ref #1920
Add docs for the test: True config option
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Fixes to special case grants (MySQL replication users)
Merge pull request #1067 from syphernl/patch-5

Fixes to special case grants (MySQL replication users)
Add support for current zone only pkgadd feature. Useful for installing packages only in the global zone
Merge pull request #2246 from romeotheriault/solaris-pkg-current-zone-only

Add support for current zone only pkgadd feature.
Added a Gemfile to include JBundler.
- showing eco & act points on MyProfile
 - added background image to spice up those dull boxes
 - fixed a javascript error in ie8 preventing event edits
added improve platform message
add disable cache wsdl and url to absolute location for travis build
testng is only needed when testing - thanks to Phillipp Katz for the suggestion
with code tutorial
Another mistake. Files where moved but not added again. Now it is corrected.
Extracted AddSelectClause to helper
Added public accessor for DatabaseType
Update to process West Bengal images.
code formatting
rename ows_psql_id_column(...) to ows_layer_id_column(...)
rename ows_psql_column_number_id_column(...) to ows_layer_column_number_id_column(...)
rename ows_psql_geometry_column(...) ows_layer_geometry_column(...)
rename ows_psql_schema_name(...) to ows_layer_schema_name(...)
rename ows_psql_table_name(...) to ows_layer_table_name(...)
rename ows_psql_is_geometry_column(...) to ows_layer_is_geometry_column(...)
rename ows_psql_not_null_properties(...) to ows_layer_not_null_properties(...)
rename ows_psql_describe_table(...) to ows_layer_describe_table(...)
rename ows_psql_type(...) to ows_layer_type(...)
Code refactoring: ows_layers_storage_fill(...) and ows_layer_storage_fill(...)
Added module "brightness"
Remove bad module
Removed capital I from default character range. In some fonts it looks like l or 1
adds music_collection.rb
Try to maintain SUDO_PASSWORD for script
updated rrd create statement
going to merge master to bootstrap
Add 1 step and add specify controller for product. (edit routing)
Don't cut a step if remaining time is non-positive
Changed MyPlayer to BufferingPlayer

Prefactor for the next generation of Player logic
Deleted obsolete changes file
Introduce FastCopyingPlayer
Use FastCopyingPlayer in client stubs
Checking for connectedness now deals with blocked targets
Fixed what looks like an infinite loop
修改debian 取消默认开启screen
Escape data in HTML; give meaningful notice when no data is returned.
Upgraded code to support CouchDB 1.2
Commented (currently unused) user management couchapp.
Proper key ref
Feature Report and Orders are linked up
Merge branch 'master' of github.com:rajeshv/pecaa
[FIX] AJAX based enabling and disabling
Merge branch 'master' of github.com:rajeshv/pecaa
[fix] changed styles in pecaa.css to fix issue in users page.
added set and get place
add plugins
Merge branch 'master' of https://github.com/shohe/dotfiles
Changes to cope with new version of prelude
Turn on pretty-mode for inferior octave
Merge BerkasTree and BerkasList controllers into Berkas controller.

* view.ShareWin: renamed to view.BerkasBerbagiWin.
* controller.ShareWin: renamed to controller.BerkasBerbagiWin.
* data.sharedlist: renamed to data.berkasberbagi_list.
* BerkasBerbagi: fix dir-up process.
* data.berkasberbagi_tree: add function to load shared dir tree.
* Berkas: fix directory refresh and dir-up process.
encoding controllers
docsearch update
try enabled Wifi wl12xx Channel 14 and 5GHZ Band
RPM creation tools
Warn when we forget to set the log_directory
oops
tpyo fix
Set GIT_DEPLOY_START_TAG in %ENV for hooks to use
Merge branch 'booking-production-master'

Patches we've had kicking around in our tree related to our own
production deployment.
Add "log" hooks to the phase hooks

We now have a execute_log_hooks() function which is just a thin
wrapper for execute_deploy_hooks() with extra environment
variables. See the attached documentation for how it works.
Revert "RPM creation tools"

This reverts commit 962cd2bf2dc391acf43f6bc9697d5bc09069b8c3.

Not really applicable for the main git-deploy repository, pushed it
here without looking at it too carefully.
add $prefix to abort announcement
add $prefix to more announcements
Merge remote-tracking branch 'booking-production/master'

Bring in minor logging changes that Matt made.
Execute log hooks on manual-sync as well as sync
add log message when manual sync is being performed
By-pass logging via environment setting.
add more tag info when aborting
minor cleanup
add more tag info to announcements
don't inject an undefined rollout tag
Revert "Git::Deploy::Say: don't show a backtrace on _die()"

This reverts commit 56fd4146d005ebeba692eec1ace9f84eaeafdf6e.

This introduced a bug where if we e.g. died while something was
calling us with eval {} we'd just exit instead of the eval catching
whatever we were doing. I don't understand what I was thinking when I
wrote this.
Git::Deploy::say: don't show a backtrace on _die() (again)

Actually do what I was trying to do in 56fd414 without introducing a
regression where nothing can ever catch this die, see the revert
preceding this commit.
more graph products
Getter und Setter überarbeitet
enable use of fftw threads

Adds fftw_init_threads & fftw_plan_with_nthreads functions.
Use $(fPIC) instead of -fPIC to prevent warnings on windows
Generalized array binary comparisons with scalars.

Also, substitute (==)->isequal etc. internally

(work in progress, it's now too general)
Specialized array binary comparisons for Numbers
small fix in spawn (broke by new array comparisons)
Error::Frame documentation
Github didn't render the function usage correctly.
Ticket #1540

Message: updated the wxTreeListCtrl to fix some event handling errors.
Owners Code Review: Yes ScottM, BrettF

[smanders] Note on importing this to git: Originally this svn commit updated *some* files from version 2006-06-21 to 2009-07-19. It looks like there was one modification beyond updating to 2009-07-19 that I'm using this commit to show since it was introduced originally in this svn commit.

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/Contrib/wxTreeListCtrl@15238 a06e8daa-702c-0410-a579-eb5e6c4fa09d
Ticket #1540 Merged video-screener related code from twig to trunk, for later integration into Vantage Screener. Owners code-reviewed? Yes(BenB, BrettF, NathanR, PaulG, ScottC, ScottM) TimedOut(ChrisM, JeffJ, PaulG) PostApproval(ChrisM, JeffJ, PaulG, ScottM, SteveF)

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/Contrib/wxTreeListCtrl@15242 a06e8daa-702c-0410-a579-eb5e6c4fa09d
Ticket #1740: Migrate Code to Visual Studio 2010 (Update Contrib) * moved wx libs from Contrib.sln to wxx.sln * renamed wx libs (OutputFile) to facilitate multiple compiler versions * made use of svn:ignore property

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/Contrib/wxTreeListCtrl@16047 a06e8daa-702c-0410-a579-eb5e6c4fa09d
Ticket #1740: Migrate Code to Visual Studio 2010 (Update wx)

* renamed wxx projects to include vc8
* created new vc10 wxx projects
* modified project settings so vc8 and vc10 can coexist
* wxx projects no longer depend on version of wx in sdlExtern
* fix link warning by adding "/Yldummylnk4206fix" to dummy.cpp (under Common Sources)

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/wxWidgets/wxx/wxTreeListCtrl@16054 a06e8daa-702c-0410-a579-eb5e6c4fa09d
Ticket #1740: Migrate Code to Visual Studio 2010 (Update wx)

* modified vc10 project files -- changed debug information format

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/wxWidgets/wxx/wxTreeListCtrl@16078 a06e8daa-702c-0410-a579-eb5e6c4fa09d
Ticket #2752: CMake: sdlExtern

* enable cmake to generate Unix Makefiles for third-party contributed wxWidgets libraries we make use of
* there are a lot of things I don't like about these cmake files (things I want to change), but this (hopefully) gets us building and fixing undefined references in our gcc link of Server code
{{{
  cd wxWidgets/wxx
  mkdir _bld
  cd _bld
  cmake ..
  make
}}}
* built libraries will be in wxWidgets/wxx/lib, ready to move/copy into sdlExtern/lib

git-svn-id: https://isrsvn.usurf.usu.edu/svn/isr/roots/wxWidgets/wxx/wxTreeListCtrl@19255 a06e8daa-702c-0410-a579-eb5e6c4fa09d
mods to make patch meaningful

* remove unused files we introduced
Create TabBar
Added check for empty password field, does not set password to blank if updated password is not provided.
More writing
added fig
Doc updates
ssl option for each app
Update ftplugin/erlang.vim

moving recent change to a proper place: ftdetect/erlang.vim
Moved Zapper to Spice
Groups need special handling

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
first commit
Merge branch 'master' of github.com:soonji/Builder
Background model
Added new style for pycon
Version as submitted 11/12/2012
Removed left margin for integrated mode as it doesn't look too good.
Build fixes

- Change configure.ac file to scan for C++ MPI compiler
- Changes on the Makefile:
  (a) Change rules for .cpp and .c file
  (b) Add dependency on the Makefile
Polly wants a cracker.
first pass at flowcharting in VP
make FN use ICONNM image path from db
added proverc, -L to curlrc and PS1 to bash_profile
go/misc/vim from release.r60
enable ls colors on OSX
Revert "ignore ext/tnef/tests"

This reverts commit 7a7951b63a9240c58cc4ac946e6cd44255b89db6.
Revert "loose some weight"

This reverts commit 6d66633ac21ea0a68ff7a3dd4ff44a09ee850fd4.
don't include big test files in the gem distribution
version bump
Updated object cache to get rid of not needed serialization and object creation
fix pathogen packages; install clang_complete for C++ auto-completion
Add joined HOG+LBP and COV+LBP
Project requirements, use cases, rev 1.
Fixed issues in Gemfile
Added serves table
Some debuging, some docstrings, some license headers
#Report Rumor Tweet: add a link and page for user to submit complaint
3rd panel added
better-looking gallery, won't work anyway…
Added display_coordinates to list of allowed params to api.update_status
Utility classes of visualisation-plot-impl moved to Util module.
Utility classes: documentation and minor refinement.
melhor README
adding http:// to readme
Adding documentation on generation and vizualization of docs in README
Moving code to src and executables
rewrite DEFKERNEL macro expansion
Agora funciona colocar as minhocas na vara de pescar.
Varias correcoes de contexto e lexico para os testes passarem
Trying to figure out this Gemfile.lock hangup
Correctif pour tenir compte de date_sortie sur les aid aussi
Correction ortho et correction d'un message erroné.
Correction sur la version.
Correctif sur l'alignement à gauche (perdu de 1.6.0 vers 1.6.1).
highlight connected nodes
siap files
Sku Image Upload update
changed the URLTitle to be a link in admin.
Merge branch 'develop' into develop-working
Removed Lock from updating skuCache.
Merge branch 'develop-working' into develop
Added relatedProducts and removed old references to old methodology.
Merge branch 'develop-working' into develop
Updated Product Defaults
Merge branch 'develop' into develop-working
Merge branch 'develop-working' into develop
Updated Master Version
Merge branch 'master' into develop

Conflicts:
	version.txt
Fixed All Issues with binaryHeap.inl
Info gathering / NetworkAnalysis / Identify live hosts is done and fully working [5% completed]
Rework FrameMain::LoadList and OnSubtitlesOpen a bit

Fix some issues where a spurious load/unload dialog would be displayed
despite that nothing would be loaded even if the user selected yes, and
double-loading of audio when opening video and audio files with
automatic audio loading enabled.

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6618 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Remove some unused options from the config file and preferences dialog

git-svn-id: svn+ssh://aegisub/var/svn/aegisub/trunk@6619 93549f3f-7f0a-0410-a4b3-e966c9c94f04
Rewrite the Resample Resolution dialog

Use more appropriate controls rather than a pile of text ctrls and some
not-entirely-correct validation of the values.

Split apart the dialog and the actual resampling logic.
Make the open/save keyframes dialog title translatable
Update Portuguese translation
Add missing languages to the hardcoded list for non-windows
Update Portuguese translation
Don't automatically load audio from video if audio from that file is already open
Handle file not found errors when opening linked audio from subtitles
Add missing period in 2.35 in a string that probably isn't actually visible anywhere
Try to find an English locale ID which is available

wxLANGUAGE_ENGLISH corresponds to the "en" locale on Linux, which is
generally not installed, which resulted in English actually being the
system default locale.

Updates #1508.
Don't list languages in the language dialog which won't actually work. Updates #1508.
first homepage commit with bootstrap
Local update
Merge branch 'master' of https://theKGS@github.com/theKGS/pop_raw.git
Merge branch 'master' of https://theKGS@github.com/theKGS/pop_raw.git
Merge branch 'master' of https://theKGS@github.com/theKGS/pop_raw.git
Changes to interface.
MapPanel
Uppdaterar med JFramePaint2. Test för att rita ut grafik.
Fixed draw routine
Merge branch 'master' of https://theKGS@github.com/theKGS/pop_raw.git
edited README + changed startup method
Adcionados arquivos padrões do trabalho.
support transfer file api
Fix structure init issues.

signed-off-by:afish@apple.com



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14014 6f19259b-4bc3-4df7-8a09-765794883524
Sync with EmulatorPkg changes.

signed-off-by:afish@apple.com



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14015 6f19259b-4bc3-4df7-8a09-765794883524
Update to build with 10.8 OS X Frameworks. This is a Mac only change.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14016 6f19259b-4bc3-4df7-8a09-765794883524
1. Correct the counter-based hash algorithm according to UEFI spec.
2. Check the reserverd bit in variable attribute.
3. Return EFI_OUT_OF_RESOURCE instead of EFI_SECURITY_VIOLATION if there is not enough speace to store the public key.
4. Fix a bug when deleting a non-existent time-based auth variable, we store the certificate into cert DB incorrectly.
5. Fix a bug that time-based auth variable can't been updated again after append operation.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting  <ting.ye@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13957 6f19259b-4bc3-4df7-8a09-765794883524
update .git-azure
oops, forgot one slide for app data in last commit
Bump to 0.0.1.dev2
Fix wording in comments
Cleaner way to setup logger
Add more links in README
Write simple usage in README
fixed merge conflict after applying stash
adding whatthehell file
merge conflict
Update i18n manual documentation
Dodanie pakietów core.c, core.m
Fixed a progaurd issue that was breaking things, fixed a bug in the my shared tasks filter
updated: change code font
removed file (to be continued)
Merge branch 'v0.2.3_branch' of github-tokiro:tokiro/tree.rb into v0.2.3_branch

Conflicts:
	Gemfile.lock
	treevisitor.gemspec
update gemspec
renamed treevisitor to tree.rb
changed document link
changed document link
don't use c++11
ug084 renamed to ug084-linux
Merge branch 'master' of github.com:tolumak/xmonad
Comments on where to put keen loading in Song model
remove some debugging statements
ignore xcode user state
Added virtus
Set default values for configurations
Set default configuration
Move pry to default group
`spec_dir` has a default value
Auto generated the test suite
Do not check the existance of `test_harness.js`
Added docs for `auto_organizing`
Merge branch 'feature/auto-organizing' into develop
Bumped to 0.1.0
Merge branch 'release/v0.1.0' into develop
allow to skip the reposync
Commit "recommended files" initially
Commit initial Python implementation
Implement training
Fix `&gt;`, `&lt;` and `&amp;` escapes.
mavgen: change default protocol to 1.0

mavlink 0.9 is deprecated
mavgraph: added --xaxis option

this allows for scatter plots
add +/-
Merge remote-tracking branch 'origin/master'
Created Initial Stories, now just need to fix the code
Add REPEAT_LAST and TITLE_ORDER_REGEX
rev version
Fix bug where the statusItem wouldn't be highlighted upon selection
Merge pull request #192 from josh-/highlighting-fix

Fix bug where the statusItem wouldn't be highlighted upon selection
renamed static dir to assets, added awesome fonts, reorgnanized assets folder
added README to instruct to look in folder
Updated Actual Results for batch 021
modified:   nodestatus.txt
argh assets!
Stupid lat and long
Fixup printing.
Switch to a set-based representation of in and out sets.
test: Add comment and mess
test: commit
changes to page rendering into string
http://www.xaloon.org/jira/browse/XWC-104
rename test.py and modified EN.py
Adding a test to make sure that subscribers are not notified unless
their parameters match the parameters of the triggering event.
Events are now filtered properly, save for subscriptions that name their
parameter key but not their values.
Added the URL and News Hacker ID to the filename of the picture.
Use correct rbx name and fiz 1.8.7 build.
Update rebar (2.1.0-pre-24-g5079bd5)
Add directory html
No need for explicit os.Stat as filepath.Walk does that for us.
Small makefile for dev.
Build a tree of path nodes.
homework 4 problem 1
homework5a: model runs
- Added some README content and the licence.
- Added NetBeans' project files.
- Removed SVG drawing for now.
Commit de paciente simple
Slider textboxlar genişletildi
Merge branch 'master' of github.com:usishi/40Ambar
Update .gitignore

exclude *.jar
dictionary functionality complete. thesaurus remaining.
split off a PadOutput class
increase memcache timeout
Committing changes to Fighter
Merge branch 'master' of github.com:vfseanm/Vooga2
Fixed the -1 critics score
update pi y commons
pp para prueba
Update warden_web/Gemfile

Updating to include psych by default.
Environment text
[F] Tracking the event on the image too
[F] Using translateY instead marginTop. Fixes #2150
[A] Moving the photo (slower) too
Using rem instead % and changing scroll behaviour
Using rem instead %
[A] Adding new scroll with the photo
Fix for new behavior, scroll image in contact details
Revert "Fix for new behavior, scroll image in contact details"

This reverts commit ffedd45887b24cb73d1377271752a2e27a96b41d.
use 'mozMobileConnection' event listeners to initialize data settings
use APN value when the 'name' tad is undefined
initial list of account providers
vendor lib update: quoting/reply/forward, idb fix.
[A] New scroll behaviour

To be fixed: It still scrolls when not enough content to scroll
Merge pull request #2352 from fabi1cazenave/settings-data

[settings] rely on event listeners to init data settings
Basic Gaia implementation of WebActivities.
Updating the WebActivities system part to make use of the ListMenu
component and to let the System Message Handler handle the window
opening.
Adding the icons to the activity chooser list.
Handling the "cancel" case for webactivities.
Update for the latest implementation.
Implementing the new sms from contact app with WebActivities.
Match base characters not diacritics in Levenshtein distance calculation and avoid allocations.
Merge pull request #3792 from fcampo/sms-new-edit

[Sms] Change edit mode Cancel button behaviour
Merge remote-tracking branch 'b2g/master' into predict
seekTo -> seek
Merge pull request #3845 from himynameismartin/master

Czech qwerty keyboard layout added
Add warning about hash functions that need to stay in sync between JS code and xml2dict.py.
Bugfix, candidates must be stored in 32-bit typed arrays, not 8-bit and add a bunch of comments.
Add empty string to convert the ID3 tags to string
Refine the pull request
Merge branch 'master' of github.com:mozilla-b2g/gaia into apply-visual-to-system-app
Merge pull request #3848 from dominickuo/music-enable-AAC

Enable AAC formats for Music App.
[F] fix error dialog
Merge remote-tracking branch 'upstream/master' into l10n-dateTime

Conflicts:
	apps/system/locales/system.en-US.properties
Merge branch 'develop' into cost-control
Using Gaia Building blocks
Cleanup when finalizying
Coding style changes

Removing dead code, better alignment.
Merge branch 'local-image-uploader' into image-uploader

Conflicts:
	test_apps/image-uploader/js/image-uploader.js
Improving code following RudyL commentaries
Merge branch 'master' into fullscreen-app
Skipped sycning vim config
add comments to temite.cfg
update zsh config
update termite.cfg
add SDL_VIDEO_X11_DGAMOUSE workaround
significiantly simple xmonad.hs
updated dictionary
Eliminate stutter
Changed $arrrrray to $appCatArray

Commit inludes just a name change
adjust text style
added EitherBinder and fixed bug in isA(clazz) function
get rid of annoying outputs from controller specs
add stub editors
日志的设置和周末大概处理
Pull console output support and REPL out of dfusion into core lib.
Renamed digging commands to uniformly start with 'dig*'(vdig -> digv etc). Added command digl, diglx (dig layerstone instead of veins). Updated readme.rst.
Fix crashing color_ostream::printerr due to vfprintf vs fprintf mixup.

Also enable heap clearing in gdb mode, and fix a few newlines.
Merge https://github.com/rh73/dfhack
Get rid of MALLOC_FILL build option
Track world and map changes separately for plugin_onstatechange
Tweaks!

Check map presence in autolabor and fastdwarf onupdate() functions
Game state tracking in kittens plugin now respects on/off switch
Merge remote-tracking branch 'warmist/master'
Lua tweaks: a couple of functions, dfusion tweak, backtrace metadata.
Improve performance of the persistent data api, and wrap it for lua.

Use an stl table for string keys to avoid linear cost of lookup.

This uncovered a bug in the new luaL_getsubtable function.
Only print the shortcut help once in the lua interactive mode.
Add df.is_instance(a,b) to check if typeof(b) is subtype of typeof(a).

Allows both objects and types as arguments. Also accepts nil and
primitives as b, returning nil.
Fix a bug: LookupTypeInfo cannot assume the result is userdata.
Optimize wrapper: use pointers instead of strings as most frequent keys.
Add dfhack.with_suspend(f[, args...]) that calls f with core suspended.

The lock is properly removed in case of error, which is then propagated.
Just for fun, it also can be yielded from within in a coroutine.
Fix coord/coord2d division/modulo operators to properly handle negative numbers (fixes some glitches with revflood and possibly other utils)
Merge https://github.com/quietust/dfhack
Track structures
Added check for reaction class items
删除：      README.md
       删除：      bucpp.nja
       修改：      generalshow.py
       重命名：    test/testfile.py -> prjmanage.py
       修改：      test/testfile.py
Restructure of join test
fixed issue where wrong data was returned from profsy_shutdown()
added first pass on tracing, still only single-thread. No unittests aswell
Remove superfluous compile flag
Add YamlDB to dump production data for use in development
test1 edit
test2 edit
merge resolved
modulo simulex
mac addr adjusted
support qusntum+ovs
Fix on BaseLight::init
Add 'vim-gnupg' vim plugin

'vim-gnupg' vim plugin is available to open GPG encrypted file and prompt when
password is needed.
release 0.7

ok, i've been talking about this for a few days, but here it is.
some of the complaints from the list have been addressed, others
are pending.  other features from the TODO list are now done.  see
the file CHANGES for details.  the major still missing features:

	- redefinition of read-eval-print loop
	- /dev/fd operations (i.e., >{} and <{})
	- redirection of primitives w/o forking
	- exporting of recursive structures

this release fixes many bugs, and should be installed for that
reason alone.  highlights of new features:

	- heredocs are implemented
	- ~ and ~user are supported by the globber
	- the vars command corresponds to rc's whatis w/o arguments
	- var corresponds to rc's whatis for variables
	- the path searching mechanism can be redefined w/%whatis
	  (but be careful---see the example)

in addition, i think it's much more portable w.r.t. header files.
This is release 0.74 of es.  This is a not quite feature complete
release, but it's getting close; see the file TODO for details on
what remains to be done.  We hope to release 0.8 within the next
10 days.  See the file CHANGES for what's been changed since the
last distribution.

This release has been tested (though not very thoroughly) on the
following machine/compiler combinations:

	NeXT OS2.1, gcc 1.36
	Sparc, SunOS 4.1.2, gcc 1.39
	Sun3, SunOS 4.0.3, gcc 1.37.1
	IBM RS/6000, AIX 3.2, native compiler
	Digital Alpha AXP, OSF/1 T1.2-2, native compiler
	DECstation 5000, Ultrix, gcc 1.39

Please tell us of any other machines which es works correctly on.

One bug to be aware of is that the interaction between control-c
and the new interpreter loops is somewhat buggy.  After you hit a
control-c, you may want to type return a couple of times.  This
will be fixed in the next release.
release 0.79
We'd like to announce release 0.8 of es.  This version is much changed since
0.79, but is much more stable (we think) and (finally!) contains a man page.
We recommend that everybody who's using es upgrade to this version.
We'd like to announce release 0.82 of es.  The main difference
between this version and 0.8 is that the <> for obtaining the return
value (exit status) of an es command has been renamed <=.  <> now
means redirection to and from a file.

Other changes include:
	signal handling has been cleaned up.
	some portability issues have been resolved.
	all reported bugs were fixed (we think).
See the file CHANGES or the man page for details.

We hope that there will be no major user-visible changes between
now and version 1.0; expected areas of change, in addition to bug
fixes, are performance and documentation.
release 0.83
release 0.84
0.9 beta1
This is now available.  Once again there are no significant changes, it
is just a nicer build and it works on more platforms.
change background color
Merge branch 'billSandbox'
Merge branch 'master' of https://github.com/wsetchell/Zujo
Merge branch 'master' of https://github.com/wsetchell/Zujo
moved categories to the right side
Added exception handling logic for resource layer.
Updated pacage structure.
Updated enunciate plugin.
Added logger.
Added test case for testing exception logic.
Format LayerRandom
ChatRoomActor refactoring #27
Merge pull request #15 from yagince/chat-room-refactor

ChatRoomActor refactoring #27
base - bitmap
intergrated with touchxml
YD: Added jBehave story template file
#28: implemented and tested briefly
#28: built-in handlers
Update scaffold to use newer date cache code
-a
Merge remote-tracking branch 'origin/master'
-a
refactor datalazyload
PonyExpress skeleton
Dispatcher messaging mechanism PonyExpress working
updated readme
Merge branch 'ng' of github.com:ytoolshed/pogo into ng
leaf replacement almost works
generic struct_traverse function replaces leaf_nodes()
heroku rename added
be able to load new input method dynamically.
addon more into filter
don't hardcode evdev
Merge branch 'master' of https://github.com/fcitx/fcitx
[pinyin-enhance] better place for bracket...
[utils] format uthash and utarray ...... too hard to read.....
[space] remove space at the end of lines and add newline at the end of files, (test/test.conf excluded)
[unicode?] gen.py 2to3 remove semicolon
[desktop-parse] add a generic desktop file parser
[desktop-parse] strspn instead of loop, ignore spaces before "=" in each entry, check before write
[desktop-parse]
move priv(owner) out of vtable so that it can be reused easily
check duplicate group/entry on load
function to add group/entry, with simplified inline functions
[desktop-parse]
return boolean for write and load (although not really that useful...)
load/write by file name
inline functions to set entry value
[utils]
swap with len
Add object helpers for typeclasses
Add (boxed and unboxed) Short rings. Add Function1 monoid.
Switch order of function composition.
Add more moments calculations.
Merge pull request #11 from echen/edwin_add_monoids

Add boxed and unboxed Short rings and a Function1[T, T] monoid
Add standard deviation.
Merge pull request #12 from echen/edwin_add_more_moments

Adds the first five central moments.
Adds a few more helpers
Merge pull request #9 from johnynek/feature/objectHelpers

Feature/object helpers
changes to HyperLogLog to reduce memory needs
Merge branch 'master' into develop
fixed to use max
removed ability to sum differently sized HLLs, now throws error
Merge pull request #13 from singhala/develop

changes to HyperLogLog to reduce memory need and handle summing HLLInstances with different length arrays
Adds estimateIntersectionSize to HyperLogLogMonoid
Adds a comment in recursive algo
Merge pull request #14 from johnynek/feature/hllintersections

Adds estimateIntersectionSize to HyperLogLogMonoid
Bump version to 0.1.1
Merge pull request #15 from twitter/develop

Bump version 0.1.1
GPII-43: Working ontology server for development, however there's an issue with discarded components passed as an argument to an invoker.
Sixth Edition

more tweaks
remove unnecessary util class
write in detail the README
Added cron string data transformation methods and aascii art for describing how cronj schedules are represented
Return the group database entry
Merge pull request #7 from zcode/patch-1

PAM: Return the group database entry
Updating docs/adding 'z' function for API
Ajout des fonctions de creation categories et tests
MaJ docblocks
Tests
Merge pull request #29 from bakura10/develop

Ajout des fonctions de creation categories et tests
Ajout de l'entite ban et gestion du suivi d'un Thread
Modifications suite retours
Modifications suite retours
Modifications suite retours
Modifications suite retours
Modifications suite retours
Changement followedBy en followers
Merge pull request #18 from Orkin/master

Ban et suivi
add three charts

now works fine
fixed model example
Fixed section splitting code (issue #9).
Fix many BUG
target lamina 0.5.0-alpha3
July 10
July 15
stringify pandora URL
Added License section.

Remove OXPrint & OXCPrint.

Renamed:
	OXLog > OXLOG
	OXCLog > OXCONDLOG
Postgres migrations fix #54
css customization of jsfiddle.net
WINKSTART-1063: Correct bud on update credit in accounts
increase resolution; brighter C's
new song: alibi
add time
Added username, lang, role and organization to user session.
Piece kinda attaches to selection marker
small changes
init
Merge branch 'amazon' of github.com:AV4TAr/meetupuy into amazon
Removed generated files.
Merge branch 'master' of github.com:AbFab3D/AbFab3D
Changed bandWidth to edgeWidth
Merge branch 'master' of github.com:AbFab3D/AbFab3D
ignore eclipse bin
Export the AppServer type for documentation purposes as per feedback.
New clock.
Testing shadows...
Cleaning
HUD is so much better now.
New background
New panel.
And one more clean
New tasks
Progress in tasks. We have shadow now!
Added calendar
No shadows for a while, sorry
Some changes...
MOAR SQUARENESS
Renewed calendar
MUCH MOAR SQUARENESS
Small color changes
Added tooltip
Added bar meters.
A little style fix in bars
ULTIMATE SQUARENESS!
Zmiana adresu do żaka na bit.ly  ( http://napwr.pl/SVGX4B )
Google App Engine 1.7.2 (Python, Java, Go).
Reports forms.py was added

Added file containing the search form and date range
validation
tested and fixed the quadtree, though it will only generate on start up
Fixed: name of project var
Fix index.php err
add minimize mode
few seconds
Fixed up Exception handling to enable compilation.
changes
Project Euler FTW
problem 5
problem 6
problem 7 likeAPro
problem 3
working on coin arrange problem ref: Knapsack problem
Setup.msi
cleanup changes for api v2.0 implementation
Revert Anticheat part. I think this not needed in repo.
Repo: Final Clean-up pt.2

* Cleaned-up whitespacing for scripts/shared dir.
* Codestyle repairs:
-   ","->", "
-   if( -> if (
-   for( -> for (
-   switch( -> switch (
* Correct more line alignments.

Signed-off-by: Bootz <bootz@projectskyfire.org>
Merge pull request #101 from Bootz/master

Final clean-up
Create BookmarkManager configurator
Adding a lot of stuff to prepare for uploading to the central repo.
changed notification settings
Always remove active class from square edge sliders.
Remove blank prefix: the standard uses a slightly different syntax.

We won't need to add code to support the new syntax until browsers
start unprefixing linear-gradient, which likely won't be a long time.
Styling cleanup/changes/options

* Remove result strip
* Add border option
* Add width option
Add solid white bg to bordered picker
Fix initial positioning of 2-axis puck

Needed to call _change() after _dimensions()
Bump to v0.9.0
Use merge date, not original commit date
Change Ax interface
Make it a windows app.
verification duplicate rejection
Fixed issue with NaN when robot 0 is disabled, move keyboard events to the correct location
Added Pastry Box 2012 posts
Added support for using post.canonical override for post URLs to link to external sites.
v. 0.0.1 Better documentation, some fixes

POST- and GET-data stored in the class Data, now. The class Post
deleted.
Images: Cambio de colores a contexto.
Important changes related to pedidos managment, now calcules stock
#36: Added support for navigation over any content, moved to /Library/views and renamed to NextPrevNavigation. Fixed bug in Entity::brith(). Update dump (install_AzatGaliev.sql)
mfreerdp-server: refactored screen capture, fixed corruption issue
Added percent complete
MAINWINDOW
Merge branch 'transitions' of github.com:CS340/PuzzleApp into transitions
PWM output disabled.
Commands added to increase/decrease PWM duty cycle via bluetooth.
Problem fixed with ticking motors. PWM duty cycle with zero length has generated the ticking.
Sped up ReflectiveEventManager
Modif CreatePersonnel and other;
AppsCabDenomination.php --> 100% completed
AppsCabType.php --> 100% completed
AppsCabOrganismePayeur.php --> 100% completed
test.php --> modified
Base de données modifier avec un jeu de données.
Fichier de test modifié et fonctionnelle, pour les 3 classes créée.
pointed 0.85 spec of MKNetworkKit to right tag

instead of commit
Adding spec for MGBox2 2.0.0
Merge pull request #814 from knickmack/MGBox2

Adding spec for MGBox2 2.0.0
add UIGlossyButton v0.0.4
Merge pull request #128 from siuying/button_004

add UIGlossyButton v0.0.4
[fix] Missing space on joined lines
Weird behavior when adding to project with '/*.{h|m}' on source_files, rolling back to older version.
Added BetterBlocks.podspec
Fixed missing full spot on summary
Merge pull request #772 from neilco/master

[Add] BetterBlocks (0.0.1)
more user page
Basic games working
Ajax call to new WS in Grails app
fix stripe text plus add chat
Multiple themes support and custom order parameters in resource consolidation. Closed #915.
Module openlayer.
urls: change the admin layout to more consistent
fixed windows starter.bat
gave mtvgt a command line interface
Added Project entity, and minor changes.

Added project entity, and management implementations (create/delete
etc). to it.

Furthermore added new interface "Renameable". Via this interface a
ProejctElement can sign, that it can be renamed. In connection to this
interface the name handling on teh DefaultProjectNode is changed.
ProjectElement not has properties, and fires property change events. The
default node takes it's displayname from this property. The existing
project elements are updated to set this property on initialization.
added some examples (taken from web)
Fixes some specs
Added assembler and fixed some bugs
bumped version to 0.0.4.0
list of files updated for 20120905 at Sep 6, 2012 4:59:47 PM
list of files updated for 20121028 at Oct 29, 2012 4:04:34 PM
Currently Windows-only: add preallocation of disk space for block file to reduce fragmentation and introduce the use of std::fstream for reading and writing the block file
Merge pull request #931 from luke-jr/dbg_loaderr

Wallet loading diagnostic prints to debug.log
move class HelpMessageBox to guiutil.cpp/.h / add button to show Bitcoin command-line options (in RPC Console -> Information) / resize Debug window a little to allow for a non-breaking display of the welcome message with non-english translation
merge toggleHidden() code into showNormalIfMinimized() to extend the functionality, but keep a simpler toggleHidden() for use in SLOT() macro
Bugtracker addition
Fixup some mistakes in last commit
Merge pull request #3 from benkasminbullock/master

This adds a bugtracker if it is specified in META.json or META.yml
JUnit-testejä valmiimmaksi ym.
Fix columns on prototype 1 measurements

Accidentally left out a column on prototype 1 measurements
add feature config base : set some commons params for the new website
add feature config locale : enable french language and l10n_update
add feature config editors : preset text formats and configure wysiwyg & imce
add feature context base : preset a few contexts for all pages, front page and other pages
Added cleaner handling
Cleaner SpdyServer.cc/.h
Adjusted coding style in eclipse settings
Implement hackery version of server-initiated connection close
Fix unitialized assoc_content, improved server side close
Added cmdline switch to enable server push
Pretty printing in spdycat
Updated sample htdocs files
Fix HtmlParser to recognize javascript tags
Add new content into the src
Add new generator to generate root package initialiser;  Added make.sh to automate local build process.  Changed grid.extent so as to alpha-numeric due to cmip5 issues.
Added a feature to run the app in landscape mode only for iOS6
add interface DBI which is implemented by both MySQLDBI and SQLiteDBI, allowing MvnP2Util to use either interchangably.
Merge branch 'master' into junit

Conflicts:
	src/main/mavenp2versionmatch/main/MvnP2Util.java
modified methods in MvnP2Util to return booleans for success/failure instead of terminating application.
factor all dbi management (initialization, open, close) out of add, update, find methods. this allows for cleaner test cases.
modified sqlite unit test for changes to where dbi intitialization happens.
made test a bit more rigorous (verifies that all of the data was stored and retrieved correctly from sqlite)
Fixed README bug.
Readme with syntax highlight
Initializing activities
Added a mapping file from dbpedia to schema.org. Does not separate equivalent classes and subclasses
Correction coquille dans le nom de fichier.
Rappot => Rapport.
Test Dossier + Package
update style a bit and add ability to clear filters
Updated version to 1.2.5-R1.2-SNAPSHOT for development towards next release.
Updated version to 1.2.5-R1.2 in pom.xml for Beta.
Updated version to 1.2.5-R1.3-SNAPSHOT for development towards next release.
We default to OP
Made clearPermissions public. Addresses BUKKIT-1541
Making MemorySection much more efficient; Addresses BUKKIT-1454
Set help index page to 1 for invalid numbers. Fixes BUKKIT-1569
Updated version to 1.2.5-R1.3 in pom.xml for Beta.
Updated version to 1.2.5-R1.4-SNAPSHOT for development towards next release.
Fixed the SubjectAlternativeNames class. It does no longer contain the Object Identifier bit is only the octet string
Implemented a class for Certificate Extensions in Certificate Signing Requests
automatic app vsn (git)
Make sure all cli arguments are decoded using the filesystem encoding before being used. fix #1709, #1574

git-svn-id: http://svn.flexget.com/trunk@3033 3942dd89-8c5d-46d7-aeed-044bccf3e60c
Fix #1672 in the proper branch. Oops.

git-svn-id: http://svn.flexget.com/trunk@3034 3942dd89-8c5d-46d7-aeed-044bccf3e60c
wfreerdp-server: fixed linked libs
wfreerdp-server: merged cmakelists
wfreerdp-server: manual merge
Merge remote-tracking branch 'upstream/master'
wfreerdp-server: control interface
Merge remote-tracking branch 'upstream/master'
merged from channels
wfreerdp-server: fixed stop server api
wfreerdp-server: added support for getting number of peers and hostname
wfreerdp-server: added APIs for more info on peers
wfreerdp-server: added connect/disconnect event callback support
wfreerdp-server: added defines for default fps and max peers
wfreerdp-server: improved tracking of peers by id
wfreerdp-server: fix parallel send
wfreerdp-server: improved peer tracking, added ability to disconnect individual peers
wfreerdp-server: generalized managed api callbacks, peer tracking bug fixes, code cleanup
wfreerdp-server: merged upstream
wfreerdp-server: fixed compilation
wfreerdp-server: initial rdpsnd support
wfreerdp-server: fixed crash after disconnect
NPE fixed
almost full support for annotations
Merge branch 'master' into dev
Fixed crashes at end of last wave with dirty hack.
Merge branch 'master' of https://github.com/Fumler/Immunity
Added README rules
Deliberately made conflicting change
Merge branch 'master' of github.com:GOFIRST/scratch

Conflicts:
	README.md (resolved)
Include deprecated subtags in list even if they do not have a Preferred-Value.
Create localizable regionNames-l10n.properties file.
Make some syntax a little more specific.
changed twitter bootstraps to sass more work on application look
Attempt to decrease world size

Since huge worlds might not be needed, shrinking might work for saving resources (if it compiles)
Changelog:
2012-05-01
- fixed a bug that prevented events with recurrence on a first Sunday
of a month to be handled correctly.
- fixed a bug that prevented aalarms to be interpreted correctly.
2012-05-14
- fixed some issues with account creation. Should now work again.
2012-05-14
- fixed some issues with account creation. Should now work again.
- now 0.0.15 is sending capability description to the server. This
might help in some cases where synchronization is not working.
Hopefully this does not break anything.
- more structure
make structures generic
map => mapping + 2 concret mapping classes
Reorg of cloud scripts (ec2.py and fabfile.py etc)
Reorg of jenkins scripts
Migrate scripts/misc from geonode-cloud
Migrate celery scripts (really dated now) from geonode-cloud
Remove old references from scripts/
Merge branch 'dev' of github.com:jj0hns0n/geonode into dev
Merge branch 'dev' of github.com:GeoNode/geonode into dev
by moving from .NET4.0 to 3.5 there was to many configuration added, restored more or less orginal web.config
updation version
Fixed %u modifier. On Node.js, it should be now possible to `require('sprint')('%s', ':)')`.
Add support for writing out the response
Use hard coded status codes
Initial work on a blocking handler
Add first test of a blocking handler
Clean up some stuff
Add simple test for a non blocking response
Change tmux config
Swap bindkey e
Merge branch 'master' of github.com:HashAv/dotfiles
Correct link to pdf version of doc
Thirst and HUD additions
Commit na Develop
basics for the psyche
add feature: add tmp to cache file, add command to reload cache file
Revert "ribbon transparency"

This reverts commit db88a3de10acd486aa73bbb0a9a8c27fa40e2297.
remove ribbon transparency, pagination to 3
pagination - maybe this?
Fittext & canvas bg
committing a change from brett
none
espaçamento
keep packages
exemplo
copyright
readme
Merge branch '888040'

Conflicts:
	README.md