labofsahil/github-event-dataset-2012 huggingface dataset:
Ignore test manifest file
Signaling configuration is stored on 'json' folder
Main page redirect to platform specific pages (currently only desktop)
Added images symlinks by hand since EGit has a bug
Improved redirection path so it works on Dropbox

Dropbox doesn't redirect from '/' to '/index.html' (instead it does to
''), so I'm adding it explicitly.
Redirect page is compliant with 5apps (html & head tags)
Added terms of use of QuickShare to be used as basis
Changed symlinks for real files since GitHub pages doesn't support them
Added and adapted script loader from JsJaC project
webp2p it's loaded from a single script tag (issue #49)
Using correct 5Apps logo (with full name)
File hierarchy adapted to new style
Merge branch 'master' into issue_18__Node.js_backend

Conflicts:
	index.html
	platform/desktop/index.html
Moving signaling errors identification to ui.js
Don't allow to search for peers if no signaling channel is available
Merge branch 'master' into issue_18__Node.js_backend
remove multi-buttons support
need to ignore folders in docs
Made bluebee nice looking :)
with bbs and repo now available
More work on as_json and start on instance methods
Ant template modified to copy all files from res directory to Android apk
Update Mon Dec 17 00:00:27 CET 2012
Added RasterReader.copy_to() utility based on SQL command COPY TO and PostGIS Raster functions ST_As<FORMAT> and outputs rasters to hex-encoded plain text or binary raster file.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10805 b70326c6-7e19-0410-871a-916f4a2858ee
#2101, add some doco in the .sql.in.c file on the _postgis_* stats info functions.


git-svn-id: http://svn.osgeo.org/postgis/trunk@10806 b70326c6-7e19-0410-871a-916f4a2858ee
Drupal module update
pull
Merge branch 'master' of github.com:ppalex/PROJET_3
pull
Merge branch 'master' of github.com:ppalex/PROJET_3
modif extract
as it turns out, we want reload to behave the same way as start in regards to using start_before
raise exception when configuration loading fails, but catch it and log as warning in process reload handler. this means if you use ginkgoctl to reload, it will fail before it even reloads. if you do a manual SIGHUP, it will log a warning that config failed to reload and will for now continue on with reloading of children
Remove Heroku dependency files
Merge branch 'master' of github.com:proj102/qrcodes
Move files up
Update COMMON_OM_PATTERNS.textile
horizontal bargraph
Add Al/Mighty Yuletide Lich
Fix Fujin stat
Remove IE version check
Fix IE7 bug
Fix Intelligent type bug
Reorder Vampire Matron and Valkyrie
Add Al/Mighty Apsara
Add Al/mighty Atlas
Add Al/Mighty Mephistopheles
Add Al/Mighty Raijin
Add Almighty-Mighty Valkyrie, Minified js by uglifyjs
on not successful test not called when deployer not avaible
added emacs gitignores to .gitignoreuse emacsclient to open files
Merge branch 'master' of github.com:psjinx/zshfiles
[changed] naming and margins
Bumped up Scala version (but not too much, or Squeryl stops working) and
no more ProGuard plugin.
commit after status remove
Merge branch 'master' of github.com:punchouty/enoch
Fixed width set for all the drop down boxes
add judges, urls for admin
add volunteers app
Added js for terms and conditions.Made basic template for all apps
Yay, now you can see other ppl in multiplayer
Remove players from world on disconnect
merge
'c ommit' -> 'commit'
FIX: broken import in broadcast_mmap example
Fix bug with monitoring arrays of strings w/ ctrl or time variants
Make some pyepics functions unicode-savvy when passed unicode strings from outside
Add PVEnumComboBox type to automatically make a combo box populated w/ PV enum values
devices/*.py: **kwargs support
motor.py: fix recursion in __getattr__()
device.py: fix recursion in __getattr__()
2nd draft of task and arg explanation
Huge shit ton of thoughts about CLI stuff
added full_name and role_symbols tests, fixed user model to pass
Update system/cms/modules/navigation/plugin.php
Merge pull request #1462 from ryun/patch-5

Use span tag for current navigation item
Adding support for alt_process for users module.

Previously was trying to select alt process data.
Fixed Files layout

fixed issue with margin in file layout when not files are present.

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Fixed a PHP 5.4 error if no theme layouts existed.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
Show status and keywords properly in Page Details.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
ignore another edge-case in recipe.barrier
omit coverage tests for some more edge-cases in partitioner recipe
Fix test for start_async.
Stop using a provided client id if the session it was tied to has expired.
Move interfaces to proper extension
hhh
Merge branch 'master' of https://github.com/pythonms/testpy.git
nowy config
gitignore updated
OK
Merge branch 'master' of https://github.com/q824650/q824650

Conflicts:
	.gitignore
	WindowsAzure1.v11.suo
Изменённый gitignore
1. Configs changed to reflect Azure package build settings.
2. AgentInfo - fields added.
Merge branch 'master' of https://github.com/q824650/q824650
[BUG #6272] use copyright header for the standalone libs
Compound assignment operator support, the implementation doesn't assume many of the operators yet though
initial commit. Gemfile has been changed: from 1.8.7 :true to 1.9 =>true
fixed skiplist insert
All test2 tests pass on OSX i386 and x86_64.
plumbing is in place for functions
Added the docs directory
fixing the vcr deployable to match the new parameter type structure
Compiling with changes to the State mechanism (direct deps initially)

State now should maintain a map of Depenency to TestDouble.
Assumptions will update that double.
Going back to -M7
Merge pull request #1 from rahuln32/master

Image reader
Merge pull request #1 from rahuln32/master

Seperated the read and write functions
Merge pull request #2 from sameerjagdale/master

rahuls decent code
socket code added
socket code tested and working fine.
Merge pull request #3 from rahuln32/master

lala
Merge pull request #4 from rahuln32/master

added .h files
Threadpool
Merge pull request #5 from bpilania/master

Threadpool added
Merge pull request #2 from sameerjagdale/master

all files
patched validations
Signed-off-by: rainqi <rain.qi.77@gmail.com> 改了哪些内容
Signed-off-by: rainqi <rain.qi.77@gmail.com>
gprs uplead manager
added customer upload classes.
properties file and context changed, make sure you change the.
Merge remote-tracking branch 'origin/master'
force vmware to use boot order
added add_share command
Writing 1
reference-task: don't create pot-file as Tempfile

Because this pot-file is included the unsuitable relative path name
from pot-file directory to current directory.
doc: RDoc -> YARD in the document of Object#domain

refs #1493

Before:
  Document-method: ...

  call-seq:
    ...

  ...

After:
  ...

  @overload ...
    @return ...
refactored while adding new method
cleanup
Merge branch 'release-1.0' of github.com:/rapila/cms-base into release-1.0
Set the min/max number of reducers (issue #85)

- Added setMinReducers and setMaxReducers in ScoobiConfiguration to
  control min/max number of reducers in all M/R jobs
Fail scoobi job when M/R job fails, and increase logging of tasks

- Added check if MapReduce job fails, and if so throw an exception
- Added more logging for completed tasks in a MapReduce job
  - If a task attempt fails or is killed, an 'info' log message is
    generated with a link to the task tracker.
  - If a task fails (usually 3 attempts), an 'error' log message is
    generated with a link to the task tracker.
Added type/schema checking to Sequence and Avro data sources

- Extended fromSequenceFile and fromAvroFile to optionally check expected and
  actual data types
- Added more Sequence/Avro acceptance tests
- Added getFileStatus method to Helper class. This resolves a Path and returns
  a Set of FileStatus objects for the Path.
- Added getSingleFilePerDir method to Helper class. Given a Path or Set of
  FileStatus objects, this method will only get one file per dir. Its useful for
  performing a rough validation of input files before a job starts.
- Refactored pathExists method in Helper class to use new getFileStatus method
- Added tests for Helper
prevent error when color in undefined

When "color" in undefined, it won't throw an error trying to access the
"color.format" property
optimize tile rendering
fixed some bugs in movement.
added destination code to combined
Merge branch 'master' of https://github.com/rbart/guide-dog
fixed NA handling in likelihood. Added more sim tests
Remove duplicate binary.
Support Linux flex-sdk location.
Add package.json, npm scripts to build single/minified sources.
Improve flex sdk detection.
merge in stuff and tweak a bittle
Move default settings into common.

Signed-off-by: Robert Deaton <rdeaton@udel.edu>
moving writeFile into fileSystemApi instead of doing it in path_resolver
fix for issue #97
Remove old mouse events and drag/drop hack - no longer needed in Qt 4.8
MumblePlugin: Fixed mac build
build-mac-deps: added speex for fetching; added -03 optimization by default if not otherwise specified
Fixed 'Save as', 'Save scene as' and 'Export' for which the custom file dialog didn't show up in case of QFileDialog::AcceptSave. Closes #249
Merge pull request #410 from Adminotech/admino-mac-fixes

This looks clean. Thanks.
nginx static files
initial import from svn
Merge https://code.google.com/p/vnoc

Conflicts:
	NetService/include/asio/ssl/basic_context.hpp
	NetService/include/asio/ssl/context_base.hpp
	NetService/include/asio/ssl/context_service.hpp
	NetService/include/asio/ssl/detail/openssl_context_service.hpp
	NetService/include/asio/ssl/detail/openssl_init.hpp
	NetService/include/asio/ssl/detail/openssl_operation.hpp
	NetService/include/asio/ssl/detail/openssl_types.hpp
	NetService/include/asio/ssl/stream_base.hpp
	NetService/include/boost/pool/detail/pool_construct.bat
	NetService/include/boost/pool/detail/pool_construct_simple.bat
	NetService/src/test/build-test.sh
dummy commit
Merge branch 'master' of https://code.google.com/p/vnoc
add program options to makefile
ignore debug folder
dummy commit
Merge remote-tracking branch 'googlecode/master'
I wish I knew what I was doing with git...
Basically 0.6.1rc1-beta with my changes... I need to pull from bitcoin-bitcoin and merge I think....
oh.. weird. the last commit -a was supposed to have included these files....
Better tracking of stale nodes, etc, finding out why block download is so slow.
Move repeated code into a function.
no idea why git thinks so much has changed... :-s
new page - elements

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>
add iterm_theme
code layout clean up test_assignable_versions of unit issue test

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10654 e93f8b46-1217-0410-a6f0-8f06a7374b81
code layout clean up test_should_not_be_able_to_assign_a_new_issue_to_a_locked_version of unit issue test

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10655 e93f8b46-1217-0410-a6f0-8f06a7374b81
add functional test to create non default document category (#11665)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10219 e93f8b46-1217-0410-a6f0-8f06a7374b81
Removes a call to form_remote_tag.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10036 e93f8b46-1217-0410-a6f0-8f06a7374b81
removing text commentary: routine instead of regex - not ready
CommentaryRemover: routine finds more commentaries within a text
formatting, marking missing tests
test: commentary at the end of the text
changed groupId: com.reka => reka
updated junit-dependency to 4.5
removed surplus plugin from pom.xml
trying to add new line
fix: not removing new lines at formatting; write the result into file
TextFileWriter: filename as param
externalized Strings
Strings of CommandLineMessenger externalized
added PgnValidator (only skeleton)
PgnValidator: basic implementation
PgnValidator renaming isValid => isValidGameText
PgnValidator refactoring: HashMap instead of 2 local variables
PgnValidator: enough opening brackets before the closing brackets required
additional test
introducing Game
splitting pgn-text into games and convert it: high-level draft
Fix typo.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Git rid of iedit.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Move configuration to eval-after-load statement.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
nTooltip: No specialization for low level characters.

Also added and option to opt-out of showing the spec icon.
Removed beam file.
- Added gitignore file
- Fixed a problem in rados.erl
- Removed pre-defined atoms, does not work well in busy system.
Fix the datalayer.

When I made foreground/background for the daemon, it would chdir, and
then try to create files relative to the original directory.  Thinks
would work with absolute paths.
Make the network layer more concurrent

With high levels of activity on a small number of sockets, the threads
would end up spinning needlessly.
Add the notion of "micro ops"

The client library specifies a set of micro ops, and they are executed
atomically
Initialize "events" in hyperdaemon::physical
Remove execute bit from files in hypercoordinator
Update .gitignore.
All atomic number ops.

The number microops all the way through the Python bindings.
Copy all attrs when applying micro ops.

All attrs with idx <= that of the highest micro op were copied, but the
remaining ones were not.  Fixed it so that all attrs are copied.
Add string prepend/append.
Support for a list datatype.
Don't SIGSEGV out when validation fails.

We checked the old pointer (known valid), when we should have checked
the new pointer generated by the validation function.
Update .gitignore.
Extra headers for hyperdisk.
Support for sets

The supported operations are add/remove/intersect/union.
Have just one datatype enum.

There was one enum maintained for the client, and one for everything else.  They
didn't have to agree, and there was a lot of useless translation between the
two.  This patch merges them into one common enum, shaving some useless code.
Fix compiler warnings related to popt parsing.
Fix warnings in hyperdaemon/physical.cc

They stemmed from a failure to call work_close (and thus, there were
unused variables.
Some endianness fixups.

e provides several convenient, portable conversion routines that are
faster than memmove + convert.  An upside of using these routines is
improved compatibility with CentOS5.
Move close/err processing to after read/write.
Inline the apply_set_${op}_${type} functions.
Merge remote-tracking branch 'remotes/tsee/simple-stats'
Factorize log fetching
Add start and end commits on the stats page text
Open perlpolicy manpage in another window
Add init scripts, logrotate rules, and update existing templates to contain managed by chef message.
use renamed PostgresCronApp and also use cursor.callproc for SPs
bug 751298 - add crontabber job for nightly builds
Merge pull request #594 from rhelmer/bug751298-nightly_builds

Bug751298 nightly builds
update requirements to new version, enable the processors incrementor
Merge pull request #595 from Lonnen/747562-statsd-back

update requirements to new version, enable the processors incrementor
bug 751298 - run for yesterday not today
Merge pull request #596 from rhelmer/bug751298-nightly_builds

bug 751298 - run for yesterday not today
Readme format test
Updates to the MUD system
Lots of updates
modules/security/pam.nix: add xscreensaver to the list of services
crashdump: it required some kernel options for the nmi_watchdog to work.

Now it says at boot, for every core:
NMI watchdog: enabled, takes one hw-pmu counter.
Don't create /var/log/upstart/<jobname> unless necessary
allow out-of-tree nixos modules

The environment variable "NIXOS_EXTRA_MODULES" is now checked to
contain a path to a file similar to modules/module-list.nix.

This gives the ability to include nixos modules that are not in the
nixos source tree.

This can be useful for modules that are still experimental, or which
aren't useful for other nixos users. Of course, this was already
possible to do this using a forked nixos tree, but with this
functionality, you can just rely on the nixos channel, easing things a
lot.
Revert "allow out-of-tree nixos modules"

This reverts commit b609ff4fcf48b2124d94bf1052c303a36c8cabf1.

It turns out this can just be done using "require".
fix init-script-builder
Mount securityfs needed for AppArmor and some TPM drivers.
Should be harmless.
AppArmor: packaged
dont hardcode apache group name when setting permissions for state dir
Merge pull request #19 from MarcWeber/fixes/apache-dont-hardcode-group

dont hardcode apache group name when setting permissions for state dir
ClamAV: package virus fingerprint database updater.
Use ext4 for VirtualBox images
renaming all occurrences of /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
modules/services/web-servers/apache-httpd: make this module more configurable

 - The new option 'apacheHttpd' determines the version of the Apache
   HTTP Server that's being used by this module. The default version
   is Apache 2.2.x, as before.

 - The new option 'configFile' allows users specify their own custom
   config file for the web server instead of being limited to the one
   that this module generates.
modules/services/web-servers/apache-httpd: add apache user to the apache group
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
Merge pull request #17 from MarcWeber/fix-init-script-builder

fix init-script-builder
F-Prot virus signaure database updater: package
virtualbox-image.nix: VirtualBox disks are /dev/sda, not /dev/vda
Replace grub-menu-builder with a much faster version

The old GRUB menu builder script is quite slow, typically taking
several seconds.  This is a real annoyance since it's run every time
you switch to a new configuration.  Therefore this patch replaces the
Bash script with a much faster Perl script.  In a VirtualBox test, the
execution time went from 2.7s to 0.1s.  The Perl version is also more
correct because it uses XML to get the GRUB configuration (through
builtins.toXML), so there are no shell escaping issues.

The new script currently lacks support for subconfigurations defined
through "nesting.children".
Small changes for dashboard page style sheets targeted at new layout
small front-end tweaks, fixed incorrect call to render in dashboard action
added margin to h1 for better differentiation between whats on now and upcoming
tweaked upcoming variable
Created jquery request to pull from the action every 5 minutes.
filtering drafts out from the archive page.
add pages carcas and module pjax
yo, commit to branch
Documentation for spell script
Improve konsole integration
gittttttttt is the greatest. made some changes to the appStore branch. merged over the ones I wanted. too easy. back to the real app
update pkgconfig file

Need to add libdl/libudev dependencies.
Create a test database on Travis
Adding an installation step
[Issue #43]
[Issue #31]
sql to pg in gemfile
remove old mk leftovers
use base_url for constants
fixed minification error
filter only in prod
base_url
updated variable to latest catkin
espace prive : affichage inscriptions

erreur dans les critères de sélection des visiteurs
Fix an ambiguous instruction that prevents the correct compilation on MacOSX.
Remove $wpdb->prepare() call to fix change introduced in WP3.5

prepare() now requires at least one variable to be substituted
Fix replacement of domains when pushing multisite subdirectory installs
Use DIRECTORY_SEPARATOR constant
Fix - don't do URL substitution when we are in admin
Do URL replacement on more content areas

Previously was just the_content. Now added wp_nav_menu, widget_text and any urls which are run through clean_url
Update version number & meta data
Release history
Merge release 0.4.1
Updated Version Number
Bump revision.
Combined contents into aggregation
Cleaned up text and transitions.
highlighter working: had a typo in field name
different output methods
Add the feature to remember the last video tree position when exiting MythVideo plugin. When the user starts it again the last position in the video tree will be shown.
The video and series grabbers use the default language of the frontend. This patch adds the option to select a different language for the video and also game information grabbers. This is useful if the user has set german as the default language but has choosen to watch mainly english videos and series.
The user can now define a homepage in the bookmark manager screen. The browser can be started with the homepage directly when the entry <action>JUMP Homepage</action> exists in the menu.
Second and required part of the remember the last video tree position when exiting MythVideo plugin. The first part was introduced in revision d6dc7c38.
Scrolling a page in the webbrowser is now 95% instead of 100%. This makes text readable again which is on a page boundary.
Seeking forward or backwards is now 10s instead of 5s.
Merge branch 'master' of git://github.com/MythTV/mythtv
Merge branch 'master' of git://github.com/MythTV/mythtv
Merge branch 'master' of git://github.com/MythTV/mythtv
Merge branch 'master' of git://github.com/MythTV/mythtv
Added initial version of the new gallery plugin. This commit contains only the very first functionality like loading and updating the image database. The main gallery and configuration screens are available. No images will be displayed yet. This commit will be the base for further development.
Merge branch 'master' of git://github.com/MythTV/mythtv
More work on the MythImage plugin. The file loading and database update is working. Added more menus. Navigation is still not working.
Additional changes to the MythImage plugin.
Renamed the ImageViewHandler class to ImageViewHelper. Small changes to the initial logic to load all data.
Splitted the data handler thread into two parts.
More development on the MythImage plugin.
Merge branch 'master' of git://github.com/MythTV/mythtv
Merge branch 'master' of git://github.com/MythTV/mythtv
Merge branch 'master' of git://github.com/MythTV/mythtv
trim build output lines before scanning them for error conditions
Control-click for synctex from editor to previewer
Fixed schema.org data
tests: implement testing function for hashlib_store
hashlib: hashlib_store: use const char for filename
hashlib: use size_t for tblsize and count
hashlib: remove unpack function from entries
hashlib: hashlib_write: fix type of variable
hashlib: implement hashlib_calloc
hashlib: implement hashlib_read
hashlib: hashlib_hash_new: fix type of function paramater
hashlib: implement hashlib_retrieve
tests: implement testing function for hashlib_retrieve
tests: add license header to test.c
hashlib: implement die macros
hashlib: use die macros
hashlib: add modes to hashlib_open
tests: fix test #5 due to undefined behaviour of get_VmRSS
tests: rename test functions
tests: test_hashlib_retrieve: specify free function
hashlib: add free function parameter to hashlib_retrieve
tests: fix test_free_function due to undefined behaviour of get_VmRSS
tests: improve test_free_function
added class for support multi match query
added test class multi match query
add extends PHPUnit
Update lib/Elastica/Query/MultiMatch.php

change of methods name.
Update test/lib/Elastica/Query/MultiMatchTest.php

extends Elastica_Test.
Merge pull request #248 from adhenawer/master

Implemented support for multi match query
adding simple_login to log in directly with a username and a password (guest/guest being the first toy account)
adding guest login link
Setting the user translation in the translation result added to the FilmtitBackendServer.
add mouse event to wordle
new target to build JChemPaint application as maven artifact without embedded dependencies
Maven project to deploy JCP artifacts into local or remote Apache Maven repository
Merge remote-tracking branch 'upstream/master'
refine set of cdkjars for a gain of 100kb in the application jar, and still add some that were missing
Merge remote-tracking branch 'upstream/master'
Chrono: Merge [81033]

git-svn-id: http://svn.boost.org/svn/boost/branches/release@81046 b8fc166d-592f-0410-95f2-cb63ce0dd405
Minor stylistic changes.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78870 b8fc166d-592f-0410-95f2-cb63ce0dd405
Polygon: improving logging to track error on MinGW-w64-4.7 jc-bell.com platform.


git-svn-id: http://svn.boost.org/svn/boost/trunk@80745 b8fc166d-592f-0410-95f2-cb63ce0dd405
Changed use of random method in reply
Monitor /g/ for programming threads and reply to them
1344479861
Removed obsolete default RoR files
Added basic Backbone javascripts
Added DB, HAML and SoundCloud gems
Added bootstrap, welcome page stub, SoundCloud gem
Redesigned the hell out of the website.
Merge pull request #4 from berry-langerak/new-design

Redesigned the hell out of the website.
Backport from trunk (rev #9350)
Fixed ds_ping_interval documentation
pi_http: fix query operation for db w/o fetch support (like db_text)
pi_http: properly handle NULL values
php-html_parse: simplify running tests ("make test" works fine)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93814 d073be05-634f-4543-b044-5fe20cf6d1d6
port maxima: fixing negative variant, adding openmaintainer


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98176 d073be05-634f-4543-b044-5fe20cf6d1d6
kdiff3: update to 0.9.97; rewrite master_sites to avoid redirects


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98177 d073be05-634f-4543-b044-5fe20cf6d1d6
emulators/qemu:
Add missing dependency on libpixman (avoid use of internal pixman)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100691 d073be05-634f-4543-b044-5fe20cf6d1d6
emulators/qemu:
Allow libpixman-devel to satisfy dependency as well


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100692 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/valgrind-devel:
Update to r13189, VEX r2601


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100693 d073be05-634f-4543-b044-5fe20cf6d1d6
databases/mysql5{,-server}:
- Bump version to 5.1.63.
- Remove mysql55 conflict.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94559 d073be05-634f-4543-b044-5fe20cf6d1d6
poster: use system -W


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90788 d073be05-634f-4543-b044-5fe20cf6d1d6
poster: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90789 d073be05-634f-4543-b044-5fe20cf6d1d6
pxsl-tools: use system -W


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90790 d073be05-634f-4543-b044-5fe20cf6d1d6
shibboleth: use system -W


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90791 d073be05-634f-4543-b044-5fe20cf6d1d6
shibboleth: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90792 d073be05-634f-4543-b044-5fe20cf6d1d6
timedrive: use system -W


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90793 d073be05-634f-4543-b044-5fe20cf6d1d6
php5-suhosin: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90794 d073be05-634f-4543-b044-5fe20cf6d1d6
pspp: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90795 d073be05-634f-4543-b044-5fe20cf6d1d6
py-zopeinterface: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90796 d073be05-634f-4543-b044-5fe20cf6d1d6
sbsat: whitespace


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90797 d073be05-634f-4543-b044-5fe20cf6d1d6
openssl: version 1.0.1


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90798 d073be05-634f-4543-b044-5fe20cf6d1d6
flex: version 2.5.36


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95756 d073be05-634f-4543-b044-5fe20cf6d1d6
Added unified py-beautifulsoup4 version 4.1.1 port.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96126 d073be05-634f-4543-b044-5fe20cf6d1d6
p5-svn-simple: whitespace cleanup.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96693 d073be05-634f-4543-b044-5fe20cf6d1d6
p5-svn-simple: follow up to r96671: bump revision to pick up new deps.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@96694 d073be05-634f-4543-b044-5fe20cf6d1d6
ocaml-dbm: new port (this library is not included anymore in upcoming OCaml 4.0 but still part in 3.x)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95894 d073be05-634f-4543-b044-5fe20cf6d1d6
netperf: update to 2.6.0 (#33245)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95896 d073be05-634f-4543-b044-5fe20cf6d1d6
Revert the previous test fix

The fail seems to be due to network error
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert the previous test fix
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert the previous test fix
Reduce case where this test will fails:
- no connection AND no mysqli extension

So, will succeed when no configured connection, but mysqli available.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce case where this test will fails: - no connection AND no mysqli extension
getConnectCount with lock
profile support & add license info
Merge pull request #168 from wenshao/master

Profile支持
Merge pull request #167 from sandzhang/master

change AutoLoad default value
remove unused import
0.2.7
Merge pull request #169 from wenshao/master

0.2.7
0.2.8-SNAPSHOT
Merge pull request #170 from wenshao/master

0.2.8-SNAPSHOT
0.2.8
improve StatView
improve StatFilter JMX support
monitor support
Merge pull request #171 from wenshao/master

0.2.8 & monitor-support
ENH: Ability to download and test against an image based on its URL

Issue 2567
This functionality will prove useful when testing data is located on
Midas. When adding a test using slicer_add_qttest, a new variable is
defined ${test_name}_BASELINE_URL to tell slicer where the baseline is.
BUG: mantis issue #2473 unify the visibility setting on the annotation nodes. Needed to have the data module displayable tree show the correct visibility flag and for calculating widget visibility in the displayable managers

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21159 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: #2629.  Window level controls conflicted with crosshair navigation

CrosshairDisplayableManager now observe events directly on the Interactor
so the InteractorStyle cannot swallow the events prior to the DisplayableManager
seeing the event.

Added facility in AbstractDisplayableManager to manage events on Interactor
in a fashion similar to how events are managed on the InteractorStyle.

Added priorities to events for Interactor and InteractorStyle

Added Abort flag to events on Interactor.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21160 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: 1574. Fixed crash on deleting FiberBundleNode

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21161 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: requesting a render to force crosshair highlight to appear

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21162 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: 2566. Added ImageFileWriter for 4-component vector

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21163 3bd1e089-480b-0410-8dfb-8563597acbee
ENH: 2532 Start with a new settings file

Delete the old testing settings file and creates a new one for current
testing.
Pushing minified JS
Adds twitter
Merge branch 'master' of github.com:sb1752/FitBitch
Merge branch 'master' of github.com:sb1752/FitBitch
Adds env for fitbit secret and fitbit token
Added a quick "how to manager"
remove linking
Fix method name used in reflection.
Merge branch 'master' into scala_next

* master:
  Fix method name used in reflection.
dummy files for test purposes
added more robust support for new directory structure regarding artifacts
Merge branch 'master' of github.com:schoffelen/MOUS
SCUMM: Add Macintosh UK version of Freddi Fish 4.
bashrc color PS1 with newline (edit probs).

If using colored PS1 on older bash versions, multi-line editing
does not work correctly. So either use monochrome PS1 (which now
can be used simply by giving PS1=$PS1_mono) or live with such a
two-line-prompt (second line is "$" only, so no escape sequences,
and this works with bash readline). To quickly change prompt, now
exported are: PS1_mono, PS1_color, PS1_color_n (with newline).

Single-line color ($PS1_color) tested with
- GNU bash, version 4.1.10(4)-release (i686-pc-cygwin)
- GNU bash, version 4.1.5(1)-release (i486-pc-linux-gnu)
fails at least with:
- GNU bash, version 3.2.33(1)-release (i386-redhat-linux-gnu)
Merge branch 'master' into win
Use a build directory, add gitignore.
Homepage updates
Cleaned up about page
Cleaned up innovators page, refactored template a bit
Cleaned up venue page
Switched Node IDs to strings
Fix package name.
go fmt
Add static renderer for the documentation app.
Add support for rendering doc pages standalone.
Cleared debug statement and added links to readme.
vimrc organize more, add break undo before some kills, and jump last cursor position
Putting initial pieces.
modified:   article/2012-05-13-summer-prevent-mosquito.wiki
修复nick bug 和乱码检测bug
field and color  export
nice
Merge branch 'master' of github.com:shark4313/nosoq

Conflicts:
	requirements.txt
	src/admin_tools/menu/management/__init__.pyc
	src/news/xmlrpc_webservices.py
	src/userena/admin.pyc
	src/userena/backends.pyc
	src/userena/decorators.pyc
	src/userena/forms.pyc
	src/userena/management/__init__.pyc
	src/userena/middleware.pyc
	src/userena/urls.pyc
	src/userena/views.pyc
	src/users/admin.pyc
	src/users/models.pyc
	src/users/templatetags/__init__.pyc
eshta
ww
Ww
ee
Working on getting couchdb working.
Added nosql connection
Loading nosql database
Added the NO_SQL attribute
converted audible behavior to DSL format
Shortening the prompt by removing 'pry'
add completion for brew and manpath
first commit
Merge branch 'master' of github.com:shitikanth/test
add line2
Statics controller
remove God Object
Updated to do item template and added some styling for a clearer ui
Remove deprecated --druby-uri option
reload webview from menu button
修改email为个人主页地址
add target="_blank"
add tools.jar optional dependency
Merge pull request #86 from wenshao/master

tools.jar的依赖添加optional属性
Merge remote-tracking branch 'main/master'

Conflicts:
	src/main/resources/support/http/resources/js/common.js
添加druid项目地址
Merge pull request #87 from libinsong/master

修改个人主页地址和项目地址
improve index.html, add jvm info
Merge pull request #89 from wenshao/master

增强index.html，添加JVM相关信息
DruidDataSource.init remove maxIdle check
Merge pull request #90 from wenshao/master

DruidDataSource初始化检查是去掉无用的maxIdle检测
缩小锁范围
Merge pull request #91 from wenshao/master

缩小锁范围
add contributor name in common.js
add '-id' argument, improve print result in cmd tool
Merge branch 'master' of git://github.com/AlibabaTech/druid
require immutable/stream.
我的作業決策樹分群和謝的小計算

我的作業決策樹分群和謝的小計算
from business to document
あちこち参考にさせてもらいながら図形言語がとりあえず動くようになった
Merge branch 'master' of github.com:sicp/ikoma-sicp
Corregimos error al mostrar lista de proyectos.
Agregamos archivos olvidados en commits anteriores.
20120803
补充eclipse改名。规定项目默认编码为utf8
HTTP and HTTPBODY now use plugin architecture
-tmp fix for setting checksum
silly bug but request is still malformed
Changes in the generator to support both clang 3.1 and 3.2.
A little bit more standard in StaticArray<T>.
Removed calls to std::to_string because MinGW does not like it yet.
Added conversion from wchar_t in UTF utils for Windows.
Updated build scripts for use in MinGW.
Merge branch 'master' of git://github.com/sk89q/craftbook
fixed: redstone does not toggle door correctly
fixes #1844
Merge branch 'master' of git://github.com/sk89q/craftbook
fixed creature spawner not spawning multiple creatures with data values attached
lightning bolt can now have a precise location offset
Merge pull request #148 from Silthus/master

Issue #1844 plus two IC fixes
Improved glowstone protection

Signed-off-by: me4502 <mnmiller1@hotmail.com>
More documentaiton

Signed-off-by: me4502 <mnmiller1@hotmail.com>
fix feature loading / adding
remove extra views
add for bugs
call 'prepost.sh post-bibtex' after bibtex is run
build script preparation
added gplv3 license
Updated font references to coincide with a Google fonts change.
broke everything, octree building is fixed, ray tracing isn't
messing with sizes of things in multiselect.css
Couple more fixes for parsing errors in core, and increase coverage.
Updating Trains text after backend switc
Tidied up usage info.
Added division
Added test for multiplication and addition in the same operation
Dispatch functions for conditions and comments
Define Forth conditions
Implement-missing-integer-comparison-operations
Implement EXIT
Implement VERSION
Revert "Implement EXIT"

This reverts commit a83d430cb57a77bf840f66fe555703ceb494cc9f.
Fixed EXIT command
Added crumpled effect
SLW-1 - Remove blue border from Char lvl
Scrutnched instruction + about
SLW-5 - Compare stats color codes and IAS fix
Merge branch 'develop' into justin
Fixe parse_git_branch to retrieve the current git branch.

git rev-name may give another branch that the current branch.
Merge pull request #14 from yann2192/patch-1

Fixe parse_git_branch to retrieve the current git branch.
Added Bootstrap popover and popovers for showing src code and other things
fix typo in the bat
schema default form element must be qualified defining root element
globally.
updated old seq->sequence name lingering in hashbits.cc
don't include omp.h unless we need threading. may not exist for everyone.
Merge pull request #3 from edvenson/5a42baae16a2db9c9f94a1463abe8b84bdbf46e6

changes from os x build experience
some en translation for the admin_area
Renaming exec_board
server example: decrease logging
Increase ionice for cron
Better file format conversion.  Recurses the whole tree.
Added a disclaimer page at the end
OlympicService
add sshic
ルールを修正
removing require stuff for heroku
improved make-callback
use nested backquotes
renamed *step* to *stepsize*
use globals as initial values instead of using them directly
abstracted loop-runge-kutta
added standalone versions to run-examples
Merge branch 'develop'

refined runge-kutta methods with loops
refined make-callback
better use of special variables (use as initial values for optional parameters)
more documentation, updated readme
Get PORT from env variable
Heroku metadata
Merge branch 'feature/heroku' into develop
Merge branch 'release/0.2'
Remove Procfile from git
Breakout into multiple files
Add google yaml
Remove google-api.yaml and ignore it
Add shotgun to gems
Remove puts
Add Procfile
Switch to env variables over yaml
Implement memcache
Remove sessions
Use ruby not rackup
Remove config.ru, finish memcache on calendar routes
Remove message.rb, use redis or cakemix for messages
后台:加入首页推荐定制
oops, this should have been work_once
added TicketAdmin and filters
added export fields to TicketAdmin
remove extra code
Merge pull request #83 from webkmua/TicketAdmin

added TicketAdmin and filters
Adding cached rake autocomplete
fix beam gitignore
gitignore .app file
add rebar
fixed aspect ratio in carousels and centering images vertically
fixed posting obv to group checkboxes
tiny bit of work on the c++ project
Fixed compile error on Ubuntu 12.04 with Arduino 1.0
Serviço xml, json. Talvez necessita migrate ou generate migration.
* formated code
* cleared imports
* removed unused stements
update note/install-kernel-byself
emacs: package install
Added info for Status box to Item view
Updated to about_page(0.0.2)
added non-public dependencies to README file
Display block on rows in browse views

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19705 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Moved exportxml

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19980 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Changes for Django 1.4

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19424 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
fix typo

git-svn-id: http://haxe.googlecode.com/svn/trunk@5454 f16182fa-f095-11de-8f43-4547254af6c6
fixed local module enum constructor priority

git-svn-id: http://haxe.googlecode.com/svn/trunk@5455 f16182fa-f095-11de-8f43-4547254af6c6
fix int overflow on PHP/JS/Flash8

git-svn-id: http://haxe.googlecode.com/svn/trunk@5456 f16182fa-f095-11de-8f43-4547254af6c6
typo fin in readme
Merge remote branch 'origin/develop' into custom-ccvonline
Merge remote branch 'origin/develop' into custom-ccvonline

Conflicts:
	Rock/Attribute/Helper.cs
	Rock/Rock.csproj
	Rock/Web/UI/Controls/Data Fields/DataTextBox.cs
	Rock/Web/UI/Controls/Grid/GridActions.cs
	Rock/Web/UI/Controls/LabeledCheckBox.cs
	Rock/Web/UI/Controls/LabeledDropDownList.cs
	Rock/Web/UI/Controls/LabeledRadioButtonList.cs
	Rock/Web/UI/Controls/LabeledTextBox.cs
	RockWeb/CSS/RockCore.css
	RockWeb/CSS/grid.css
Add Recordings block back
Split Pascal and CamelCase auto-registered block names.
Updated to refer to David's Git Branching strategy document and the Rock:Grid UI control
Merge remote branch 'origin/develop' into custom-ccvonline

Conflicts:
	Rock/Attribute/Helper.cs
	Rock/Field/FieldType.cs
	Rock/Field/Types/Boolean.cs
	Rock/Field/Types/Color.cs
	Rock/Field/Types/Date.cs
	Rock/Field/Types/Decimal.cs
	Rock/Field/Types/DefinedType.cs
	Rock/Field/Types/DefinedValue.cs
	Rock/Field/Types/Document.cs
	Rock/Field/Types/Image.cs
	Rock/Field/Types/Integer.cs
	Rock/Field/Types/PageReference.cs
	Rock/Field/Types/Person.cs
	Rock/Field/Types/SelectMulti.cs
	Rock/Field/Types/SelectSingle.cs
	Rock/Field/Types/Text.cs
	Rock/Field/Types/Url.cs
	Rock/Field/Types/Video.cs
	Rock/Rock.csproj
	Rock/Web/UI/Controls/Data Fields/DataDropDownList.cs
	Rock/Web/UI/Controls/Data Fields/DataTextBox.cs
	Rock/Web/UI/Controls/LabeledDropDownList.cs
	Rock/Web/UI/Controls/LabeledTextBox.cs
	Rock/Web/UI/Page.cs
	RockWeb/Blocks/Administration/Blocks.ascx.cs
	RockWeb/Plugins/CCVOnline.com/Service/Recordings.ascx
	RockWeb/Plugins/CCVOnline.com/Service/Recordings.ascx.cs
Add Person Merge proc
Change recording stop to update stop response instead of start response
Add sorting to recording grid
Merge remote branch 'origin/custom-ccvonline' into develop
Fix error that was occurring when properties of the grid action were being set prior to it being initialized.
Merge remote branch 'origin/develop' into custom-ccvonline
Add Page Context logic and migration
Merge remote branch 'origin/custom-ccvonline' into develop
Added Metrics capability and display page
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Rock/Rock.csproj
Initial version of the Rock Plugin Manager
Bug fix, wrong table name on the Down method for AddPackageManager migration
Merge remote-tracking branch 'origin/feature-na-plugin-manager' into develop

Conflicts:
	Rock/Rock.csproj
Mis merged after last merge with my feature branch.
Hide posts with "draft" tag from feeds and indexes.
documented drafts
Fixup, the filters were not set.
use the zip for pip, looks nicer
Updates index.tmpl to its upstream version (and discards 'my' version)

The changes I made are better done on the templates for the site and not in the
code.
Merge remote-tracking branch 'upstream/master'
jqGrid 연동 완료

이제 상세 보기 및 설정만 남았다.

Signed-off-by: Karuana <mse201@gmail.com>
실제  앱 엔진 서버에서 타입 매칭이 되지않던 버그 고침

백 그라운드로 작업한 경우 일정 확률로 DB Write가 안된 경우가 있다. 그래서 해당 경우를 해결하기위해  null이 호출된 경우 리롸이팅

Signed-off-by: Karuana <mse201@gmail.com>
Merge branch 'master' of https://github.com/swlogdog/logdog
Import postfix version 2.0.0
Add fail2ban to default install
Add vim and vim-scripts to default install
Add man to default install
Fix Typo for man
Add Chef Apt Repo
fix chef repo typo
Fixed an "Array to string conversion" warning when using PHP 5.4. Also affects Symfony2 master.
merged branch fixe/patch-3 (PR #3597)

Commits
-------

ed218bb Fixed an "Array to string conversion" warning when using PHP 5.4. Also affects Symfony2 master.

Discussion
----------

[Config] Fixed an "Array to string conversion" warning when using PHP 5.4

This also affects Symfony2 master
Removed Software Directory
selinux: selabel_lookup_raw can return ENOENT and be a non failure mode.
core: Refuse to run a user instance when the system hasn't been booted with systemd.

Running as a user instance won't work at all if systemd isn't running as system
manager, so refuse to start in that case.
core/swap.c: Do not add Before=swap.target to swap units.

The fstab generator adds Before=swap.target by default, and when creating
a custom .swap unit, you can also add Before=swap.target to the unit.

However, it is impossible to not have this ordering dependency right now.
Virtually all existing setups likely use the fstab generator, so this
change is unlikely to break anything.
configure.ac: Add a --without-python option.

Being able to be explicit about Python support (in addition to the
default of auto-detecting it) and acting upon the result, specifying
it as an option gains us more control about both dependencies and
the resulting build.

Furthermore, relying purely on auto-detection can lead to problems for
source-based distros. E. g. systemd being built before *both* 32-bit &
64-bit ABIs are installed will lead to build failures as systemd's
build system will pick up either 32-/64-bit Python, conclude both are
available and fail if that's not the case.
Move sources to a subdirectory
Moved the event handling code to a separate file.
shieet just tryina get some ish workin namsayyin?
move more code around
Remove files that souldn't be in the repository
Add a Bailador::App class

It is not really necessary as for now, but it certainly will be later,
and it does make some things easier
First cut at Bailador::Test, add some very basic tests too
improve sound, add frame counter, abs, distf and circler
Prepare new gem release v 0.2.3
fixing add/removeVertex
3d相册
Downgrade to 0.0.0 for the gemstealin'
DW: refactored doc and src folders. Now we will work on 2.0.
DW: 1. added commercial blogs' pdf on the web, we can see how people talk about our bubbles; 2. updated LICENSE and README.md, just made it more clear and cool.
Fix tests on staging
Added Time Selector tests
Added format method to time selector to allow format of outputted time to be specified

Need to switch val() to use it as well as add shortcut format strings.
Giving models their own ID property at creation time (just the cid) so that some info about the model can be written to the DOM
Round 1: easy deletions
changed info header link to the presentation in the templates
	modified:   cupcakery/data/cache/bc7132b2b89a30e42b3c400a675f6a4d.txt
	modified:   cupcakery/data/cache/f51a90bd00f04089078b051d64b6d229.txt
	modified:   cupcakery/theme/cupcakery/header.inc.php
	modified:   hightechnologies/data/cache/f51a90bd00f04089078b051d64b6d229.txt
	modified:   simplico/data/cache/bc7132b2b89a30e42b3c400a675f6a4d.txt
	modified:   simplico/theme/simplico/header.inc.php
Cleared out cobwebs, starting from base
Working canvas implementation
Updated README markdown
Comments, brightness, individual frame brightness levels
Imgur uploading and twitter posting
Make sure to include imgur.py
Updated gitignore
Added and tweaked camera position list, added brightness check
Created a basic class for accessing the CJDNS web interface with PHP.
Accept function arguments properly
Use WebRTC from TeamICS

This fixes compilation errors for ARMv6 devices
allow passing None as translator_class
Merge branch 'refs/heads/develop'
Version bump
Added description
Merge branch 'refs/heads/master' into develop
Add cursor pointer to Todo Lists.
Merge pull request #161 from wbzyl/examples-todos

Add cursor pointer to Todo Lists.
Merge branch 'master' of git://github.com/meteor/meteor
Basis for discussions on defaults
Corrected Typo
PluginHandler Unittests
render the view
Plugin Exception
Refactoring
Standard dispatcher Unittests
added getResponse(), setDispatchDirectory() and getDispatchDirectory()
AbstractDispatcher Unittests
Corrected Docblock
set include paths
use require_once intead of include
Realizing at 4 in the morning that your construction is shit.
compare x,y,z position instead of checking index
pretty printing of exception; remove unused Runtime.thread_queue
Make sure the environment doesn't get replaced
slowed stieff scene/redid prites
Merge branch 'master-fade' of https://github.com/timclayton/hc12
Save local changes ...
added node tests